diff options
Diffstat (limited to 'pkgs')
635 files changed, 25819 insertions, 6475 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix new file mode 100644 index 00000000000..b6dea53012d --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg +, libxkbcommon, xdg-utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "4.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063"; + }; + + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \ + $out/share/applications/com.bitwig.BitwigStudio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + + runHook postInstall + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${lib.makeBinPath [ xdg-utils ffmpeg ]}" \ + --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" + done + + ''; + + meta = with lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 9bbbaf22f42..ee4d16d6b36 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , desktop-file-utils , fetchFromGitHub +, calf , fftwFloat , glib , glibmm @@ -12,6 +14,7 @@ , libsamplerate , libsndfile , lilv +, lsp-plugins , lv2 , meson , ninja @@ -23,6 +26,7 @@ , rubberband , speexdsp , wrapGAppsHook +, zam-plugins , zita-convolver }: @@ -72,6 +76,24 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + preFixup = + let + lv2Plugins = [ + calf # limiter, compressor exciter, bass enhancer and others + lsp-plugins # delay + ]; + ladspaPlugins = [ + rubberband # pitch shifting + zam-plugins # maximizer + ]; + in + '' + gappsWrapperArgs+=( + --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" + --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" + ) + ''; + separateDebugInfo = true; meta = with lib; { diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 65499f58630..9e338e19813 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab , python3 , perl , perlPackages @@ -6,6 +6,7 @@ , intltool , libpeas , libsoup +, libdmapsharing , gnome , totem-pl-parser , tdb @@ -18,6 +19,25 @@ let pname = "rhythmbox"; version = "3.4.4"; + + # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. + + # This PR would solve the issue: + # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12 + # Unfortunately applying this patch produces a rhythmbox which + # cannot fetch data from DAAP shares. + + libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec { + version = "2.9.41"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = old.pname; + rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p"; + }; + }); + in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -46,8 +66,12 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base + + libdmapsharing_3 # necessary for daap support ] ++ gst_plugins; + configureFlags = [ "--enable-daap" ]; + enableParallelBuilding = true; passthru = { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index db0f69c80ab..d81ab4b3ac7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -82,7 +82,7 @@ stdenv.mkDerivation { sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; }; - nativeBuildInputs = [ makeWrapper squashfsTools ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; dontStrip = true; dontPatchELF = true; @@ -109,6 +109,9 @@ stdenv.mkDerivation { runHook postUnpack ''; + # Prevent double wrapping + dontWrapGApps = true; + installPhase = '' runHook preInstall @@ -138,6 +141,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ + ''${gappsWrapperArgs[@]} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix PATH : "${gnome.zenity}/bin" diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 162a5ddee1a..00727d294df 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,21 +1,22 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config , autoreconfHook -, db48 -, sqlite +, pkg-config +, util-linux +, hexdump +, wrapQtAppsHook ? null , boost +, libevent +, miniupnpc , zeromq -, hexdump , zlib -, miniupnpc +, db48 +, sqlite +, qrencode , qtbase ? null , qttools ? null -, wrapQtAppsHook ? null -, util-linux , python3 -, qrencode -, libevent , nixosTests , withGui , withWallet ? true @@ -43,13 +44,14 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkg-config autoreconfHook ] - ++ optional stdenv.isDarwin hexdump - ++ optional withGui wrapQtAppsHook; - buildInputs = [ boost zlib zeromq miniupnpc libevent ] + [ autoreconfHook pkg-config ] ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals withGui [ wrapQtAppsHook ]; + + buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ optionals withGui [ qrencode qtbase qttools ]; postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index a3341a25b14..b2d28ed8942 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.1.3"; + version = "0.2.2"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y"; + sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 4b0b8e75748..2ff82804318 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-P5oWOQgyj+/Ia21R4PB6ID/iUPKBnW9/X5EF6RZjzS8="; + sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs="; }; patches = [ diff --git a/pkgs/applications/blockchains/elements.nix b/pkgs/applications/blockchains/elements.nix new file mode 100644 index 00000000000..c44f2078dae --- /dev/null +++ b/pkgs/applications/blockchains/elements.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, util-linux +, hexdump +, wrapQtAppsHook ? null +, boost +, libevent +, miniupnpc +, zeromq +, zlib +, db48 +, sqlite +, qrencode +, qtbase ? null +, qttools ? null +, python3 +, openssl +, withGui +, withWallet ? true +}: + +with lib; +stdenv.mkDerivation rec { + pname = if withGui then "elements" else "elementsd"; + version = "0.18.1.12"; + + src = fetchurl { + url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"; + sha256 = "84a51013596b09c62913649ac90373622185f779446ee7e65b4b258a2876609f"; + }; + + nativeBuildInputs = + [ autoreconfHook pkg-config ] + ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals stdenv.isDarwin [ hexdump ] + ++ optionals withGui [ wrapQtAppsHook ]; + + buildInputs = [ boost libevent miniupnpc zeromq zlib openssl ] + ++ optionals withWallet [ db48 sqlite ] + ++ optionals withGui [ qrencode qtbase qttools ]; + + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + ] ++ optionals (!doCheck) [ + "--disable-tests" + "--disable-gui-tests" + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + checkInputs = [ python3 ]; + + doCheck = true; + + checkFlags = + [ "LC_ALL=C.UTF-8" ] + # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. + # See also https://github.com/NixOS/nixpkgs/issues/24256 + ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + + enableParallelBuilding = true; + + meta = { + description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; + longDescription= '' + The Elements blockchain platform is a collection of feature experiments and extensions to the + Bitcoin protocol. This platform enables anyone to build their own businesses or networks + pegged to Bitcoin as a sidechain or run as a standalone blockchain with arbitrary asset + tokens. + ''; + homepage = "https://www.github.com/ElementsProject/elements"; + maintainers = with maintainers; [ prusnak ]; + license = licenses.mit; + platforms = platforms.unix; + # Qt GUI is currently broken in upstream + # No rule to make target 'qt/res/rendered_icons/about.png', needed by 'qt/qrc_bitcoin.cpp'. + broken = withGui; + }; +} diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 59e09939e80..d7a27dd4bcc 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -9,14 +9,9 @@ , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror , hidapi, rapidjson, quirc -, trezorSupport ? true -, libusb1 -, protobuf -, python3 +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - stdenv.mkDerivation rec { pname = "monero-gui"; version = "0.17.2.2"; @@ -30,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook - (getDev qttools) + (lib.getDev qttools) ]; buildInputs = [ @@ -41,8 +36,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] - ++ optionals stdenv.isDarwin [ qtmacextras ]; + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] + ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -98,7 +93,7 @@ stdenv.mkDerivation rec { done; ''; - meta = { + meta = with lib; { description = "Private, secure, untraceable currency"; homepage = "https://getmonero.org/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a12bfe872b..7dd2e569021 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -4,17 +4,9 @@ , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson , CoreData, IOKit, PCSC -, trezorSupport ? true -, libusb1 ? null -, protobuf ? null -, python3 ? null +, trezorSupport ? true, libusb1, protobuf, python3 }: -with lib; - -assert stdenv.isDarwin -> IOKit != null; -assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; - stdenv.mkDerivation rec { pname = "monero"; version = "0.17.2.0"; @@ -45,8 +37,8 @@ stdenv.mkDerivation rec { zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf - ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" @@ -54,7 +46,7 @@ stdenv.mkDerivation rec { "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; outputs = [ "out" "source" ]; diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix new file mode 100644 index 00000000000..6fd91495b47 --- /dev/null +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -0,0 +1,67 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch +, cmake, pkg-config +, boost, openssl, unbound +, pcsclite, readline, libsodium, hidapi +, rapidjson +, curl, sqlite +, trezorSupport ? true +, libusb1 +, protobuf +, python3 +}: + +stdenv.mkDerivation rec { + pname = "oxen"; + version = "9.1.3"; + + src = fetchFromGitHub { + owner = "oxen-io"; + repo = "oxen-core"; + rev = "v${version}"; + sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb"; + fetchSubmodules = true; + }; + + # Required for static linking, the only supported install path + lbzmqsrc = fetchurl { + url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"; + sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1"; + }; + + postPatch = '' + # remove vendored libraries + rm -r external/rapidjson + sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake + ''; + + postInstall = '' + rm -R $out/lib $out/include + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + boost openssl unbound + pcsclite readline + libsodium hidapi rapidjson + protobuf curl sqlite + ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + # "-DUSE_DEVICE_TREZOR=ON" + # "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + # It build with shared libs but doesn't install them. Fail. + # "-DBUILD_SHARED_LIBS=ON" + "-DLIBZMQ_TARBALL_URL=${lbzmqsrc}" + ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + meta = with lib; { + description = "Private cryptocurrency based on Monero"; + homepage = "https://oxen.io/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 4bb5f1f7a6b..8d2da4c3665 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.6.1"; + version = "21.7.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; - x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; + aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A=="; + x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 851c3ea1c2f..df0be4ccfbe 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive -, shared-mime-info, libhandy +, shared-mime-info, libhandy, fira }: let @@ -31,6 +31,12 @@ in stdenv.mkDerivation rec { glib-networking libhandy ]; postPatch = '' + substituteInPlace data/media/css/web/base.css \ + --replace 'url("/app/share/fonts/FiraSans-Regular.ttf") format("ttf")' \ + 'url("${fira}/share/fonts/opentype/FiraSans-Regular.otf") format("otf")' \ + --replace 'url("/app/share/fonts/FiraMono-Regular.ttf") format("ttf")' \ + 'url("${fira}/share/fonts/opentype/FiraMono-Regular.otf") format("otf")' + patchShebangs --build build-aux/meson_post_install.py ''; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f6e6283338d..bab29597c76 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.133.5"; + version = "1.137.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-0QWYitlOS3x7BQpFTYDAjIgkw83IkRFfA/slyEvQUnw="; + sha256 = "sha256-OiLYXx1sBkEJpMPTa/45QPHLtmeI6ZLles7GfjEBGtQ="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 7866f2dd272..8ca09925058 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -6,33 +6,33 @@ }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2021.02.13", - "sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8" + "rev": "2021.07.02", + "sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.05.16", - "sha256": "sha256-oQW0M8Sx1bC+keOWivXwlD5SDKJuO5Sk/3HiO9HvJtY=" + "rev": "2021.07.09", + "sha256": "sha256-hVoHH29JLPy3qq73e5EV4bxERcizocO4RBgvqD+VhWo=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.05.31", - "sha256": "sha256-4B6/I0CH9gfslwUbCTTI4kycgTHUjLGtVrCctfO6gRo=" + "rev": "0cf6e09f673beb3a25d6957c97eeeee37024617b", + "sha256": "sha256-oqxzORNva7tZXNlI/mSe722p6Tbkf7Ie6GPL3TxjV98=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.05.03", - "sha256": "sha256-zns83XA2SslHRGqa3iro0phIBlz5/neJ34TTYAKhX5Q=" + "rev": "2021.07.09", + "sha256": "sha256-w5f1s8yjkYfDqAcKISRgJd3fe+f2NyO3ZtFLLfiBm2Q=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.05.27", - "sha256": "sha256-D0UBK69V28Izs9FgevtvX6vyDU7KpfIGJqcqpWaxU9E=" + "rev": "2021.07.02", + "sha256": "sha256-PndvBiqdqw681AC6q33UWdzUvcYHxj1WuYsVFi2HK7c=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.05.27", - "sha256": "sha256-1zhSB6bgeW5G6RAZvhznNTpRk0uEDZnLXsk+cgElKLw=" + "rev": "2021.07.09", + "sha256": "sha256-QCG9i26m3v9J4uO1I1BiDwBerH4iX1rAJuNqx+gHLnA=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 02a9a6e6562..69db13fec19 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText }: +{ lib, stdenv, texinfo, writeText, gcc }: self: let @@ -32,7 +32,7 @@ self: let }; elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText; + inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index 2ddafc4796c..8ecce11a742 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -67,8 +67,7 @@ in { lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { - inherit pname; - ename = ename; + inherit pname ename commit; version = if isNull version then "" else lib.concatStringsSep "." (map toString version); # TODO: Broken should not result in src being null (hack to avoid eval errors) diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index b19b1ac2b68..0b550c5f11d 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; - phases = [ "installPhase" ]; + dontConfigure = true; installPhase = '' tar xf ${src} diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index bfa7e8e2009..f36009afc69 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -131,6 +131,7 @@ in - Improve extensibility with a new plugin architecture ''; homepage = "https://www.neovim.io"; + mainProgram = "nvim"; # "Contributions committed before b17d96 by authors who did not sign the # Contributor License Agreement (CLA) remain under the Vim license. # Contributions committed after b17d96 are licensed under Apache 2.0 unless diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 96b61a43cca..d94f3239f4b 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -131,7 +131,6 @@ let hydraPlatforms = []; # prefer wrapper over the package priority = (neovim.meta.priority or 0) - 1; - mainProgram = "nvim"; }; }; in diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index e353f4f5652..b4bfc6c9ea7 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation (rec { inherit pname; version = buildVersion; - phases = [ "installPhase" ]; + dontUnpack = true; ${primaryBinary} = binaryPackage; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 97299bef3ac..13eabde14e6 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation (rec { inherit pname; version = buildVersion; - phases = [ "installPhase" ]; + dontUnpack = true; ${primaryBinary} = binaryPackage; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 48e1369c8c3..2cda81c2588 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,7 +2,7 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index d9a4ed2a894..a7f9fb328ff 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -77,7 +77,7 @@ let installPhase = '' runHook preInstall - '' + (if system == "x86_64-darwin" then '' + '' + (if stdenv.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" $out/bin cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName} diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 68249c20d13..709fbe1c751 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -19,18 +19,22 @@ fi VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name) sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable" -VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix" +VSCODE_X64_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable" +VSCODE_X64_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_X64_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_X64_LINUX_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable" -VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" +VSCODE_X64_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable" +VSCODE_X64_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_X64_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_X64_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_AARCH64_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable" -VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL}) -sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix" +VSCODE_AARCH64_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable" +VSCODE_AARCH64_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_AARCH64_LINUX_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_AARCH64_LINUX_SHA256}\"/" "$ROOT/vscode.nix" -VSCODE_LINUX_ARMV7L_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable" -VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL}) -sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix" +VSCODE_AARCH64_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin-arm64/stable" +VSCODE_AARCH64_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_AARCH64_DARWIN_URL}) +sed -i "s/aarch64-darwin = \".\{52\}\"/aarch64-darwin = \"${VSCODE_AARCH64_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_ARMV7L_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable" +VSCODE_ARMV7L_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_ARMV7L_LINUX_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_ARMV7L_LINUX_SHA256}\"/" "$ROOT/vscode.nix" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 85804f3bf2f..dc22a92238e 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -7,22 +7,24 @@ let x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; + aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; }.${system}; - archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; + archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cklp0mp7qylzrqnfbvzs308q0bzpswlqw5n98qhl1jb5783svx1"; - x86_64-darwin = "04yyv0wpkzdjfiy9kj2jslhv7nc5i6nw2207vfnbzysgs55l3x63"; - aarch64-linux = "1ygk51902g0q7x3r6kd3s7gi2gx86x10svpvbipl494qcyfngqzs"; - armv7l-linux = "0z5rg1nl8lz7zsvml6dfz093dbyrkr4zvvfssqiyarw4n24d2mim"; + x86_64-linux = "049spg4c1arkw97mg0h046kiirmcrjj97sy4ldiblwldjn510acw"; + x86_64-darwin = "0g6b1891ag4a6p7rlkfka5v4nbmpr4ckkmibhw8l3wa9zdzs77x6"; + aarch64-linux = "1qvk6cn5v9bz4vl5ifpdgrba94v6a54xx8s3fxdkj3lqvq27kpd1"; + aarch64-darwin = "1whgjkxy70ifx1vaddxr8f1xcg651fhca4x7rzidzbyyf3baghy0"; + armv7l-linux = "1k45s81s4ispc0vz7i17a7gss05d82vpymxgangg6f1yxwz944r4"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.57.1"; + version = "1.58.2"; pname = "vscode"; sourceExecutableName = "code"; @@ -57,6 +59,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 849f435eb36..000c12bc72c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16s3hznyrz9w0cns8fk3pzk9ai5dj9y5p4n1rf3hrpg5hi9yxi5j"; - x86_64-darwin = "133p032c8gv3hx4x7kxdfhz4xvkpjmjnvy02sf05dxqv5nly4xx4"; - aarch64-linux = "183f674qyrlz0wqx6x48z6jhl8z30zmwsj8021hqi8px5ny99l1f"; - armv7l-linux = "0rf3ybha861r5pfp6rvh21abfagaiwqlsbxm7fhphrc5382lmxbs"; + x86_64-linux = "11h4c5ghgn3qrg66jh2par3cl3fqzn9xb7gdniww4badnyajnij8"; + x86_64-darwin = "0hd3qdxg4cknk3fxv509jlblwmfx65bm2a4arsg255224dpg64n2"; + aarch64-linux = "0waakj413kqf68sawajd3n24qdbx6b2svyb4lgbn0sy1apc96s3c"; + armv7l-linux = "1ij2bmsk601f1vjljj6gvxsxrcjqf2m74s9kc006hmcz7czjgk8f"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.57.1"; + version = "1.58.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index cc15b96b4b6..540a74e6524 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,7 +3,7 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome -, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages +, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages, gmic, libavif, icu }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes + libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes gmic libavif icu ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd ] ++ lib.optional stdenv.isDarwin gtk-mac-integration diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index db23a181c5a..141f966253d 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -55,11 +55,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zYfs4UOu+gLmkqSvXDw8wQe5pNYYBNefp33S40R5ihc="; + sha256 = "sha256-la6pO+HP05u1IzO4Kz5Xv2gIDH0TGddU0WeiD22+RVE="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c7484f4cbfe..31d14185dcd 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , ghostscript , libpng , makeWrapper @@ -20,6 +21,15 @@ stdenv.mkDerivation rec { sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; }; + patches = [ + (fetchpatch { + name = "CVE-2021-3561.patch"; + # Using Debian patch since it is not possible to download it directly from Sourceforge + url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch"; + sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpng ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f7f1e17be22..a83070e5e6b 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ # Fixes build with exiv2 0.27.1 (fetchpatch { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/hugin-exiv2-0.27.1.patch?h=packages/hugin"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; }) ]; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index e9507129a2c..c9d119a7d60 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; installPhase = let diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index c6861b218de..587877ad7a7 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,24 +1,26 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - ki18n, xcb-util-cursor, - kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, - knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff, kwayland, qttools +{ mkDerivation, lib +, extra-cmake-modules, kdoctools +, ki18n, xcb-util-cursor +, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins +, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi +, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator }: mkDerivation { pname = "spectacle"; - meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor - knewstuff kwayland + knewstuff kwayland kcolorpicker kimageannotator ]; postPatch = '' substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ --replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + broken = versionOlder qtbase.version "5.15"; + }; } diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 08d5524fc3a..0a89e4f4765 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -21,11 +21,11 @@ buildPythonApplication rec { pname = "archivy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; + sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0="; }; # Relax some dependencies @@ -38,7 +38,10 @@ buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'tinydb ==' 'tinydb >=' + --replace 'tinydb ==' 'tinydb >=' \ + --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ + --replace 'Werkzeug ==' 'Werkzeug >=' \ + --replace 'Flask ==' 'Flask >=' ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 305ab891713..26ca3898134 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "2.93.0"; + version = "2.93.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0f2rpqa39sir6g90khd2d2fs4kss0zhk7vya1nscf5yp8r566fxs"; + sha256 = "sha256-IdriOBw/DlpH6B0GKqC1nKnhTZwrIL8U9hkMS20BHNg="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index a9ccc6a8f87..6e13cc4728e 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "cobalt"; @@ -13,10 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "Static site generator written in Rust"; homepage = "https://github.com/cobalt-org/cobalt.rs/"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 8d77588ce8f..6b8f92ddb1c 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols -, glib, wayland, libxkbcommon, makeWrapper +, glib, wayland, libxkbcommon, makeWrapper, wayland-scanner +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,9 +16,19 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ]; buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; + # Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/ + patches = [ + # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included + (fetchpatch { + url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch"; + sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o="; + }) + ]; + postInstall = '' wrapProgram $out/bin/dmenu-wl_run \ --prefix PATH : $out/bin diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index cd1c659ec5b..c17ed9b3af5 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Command line todo list with super-reliable git sync"; homepage = src.meta.homepage; license = licenses.mit; - maintainers = with maintainers; [ stianlagstad foxit64 ]; + maintainers = with maintainers; [ stianlagstad ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index 0568198f41d..f9c04fedfdd 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -86,8 +86,7 @@ let in stdenv.mkDerivation rec { inherit pname version src; - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ jdk11 gradle_5 ]; + nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ]; buildPhase = '' mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 5cfca0b4a2b..b617e7b2ea1 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.18.0"; + version = "1.18.1"; src = fetchPypi { inherit pname version; - sha256 = "a0658cd2b629ec5b24b9a893056ce7224088ee5eb760f30642131a8df0279131"; + sha256 = "1e231ed7122a753430d92f8c6240a99defa2b307d57f1a4cc3e48910269331a9"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 28de8e0ecea..da190218d09 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, gettext, fetchpatch }: stdenv.mkDerivation rec { pname = "gcal"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; meta = { description = "Program for calculating and printing calendars"; diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/applications/misc/gmnitohtml/default.nix new file mode 100644 index 00000000000..a4b6f9403c6 --- /dev/null +++ b/pkgs/applications/misc/gmnitohtml/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: + +buildGoModule rec { + pname = "gmnitohtml"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~adnano"; + repo = pname; + rev = version; + hash = "sha256-XcHJbqmfSkW6lt2xRlrf9AJfwLOZqdgsL1v0aK2bQwo="; + }; + vendorSha256 = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; + + ldflags = [ "-s" "-w" ]; + + # Build and install the man pages + nativeBuildInputs = [ scdoc installShellFiles ]; + + postBuild = '' + make gmnitohtml.1 + ''; + + postInstall = '' + installManPage gmnitohtml.1 + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/gmnitohtml --help + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://git.sr.ht/~adnano/gmnitohtml"; + changelog = "https://git.sr.ht/~adnano/gmnitohtml/log"; + description = "Gemini text to HTML converter"; + longDescription = '' + he gmnitohtml utility reads Gemini text from the standard input and writes + HTML to the standard output. + ''; + license = licenses.mit; + maintainers = with maintainers; [ jk sikmir ]; + }; +} diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index c3b9a3226a3..53c0a96060e 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb-compat-0_1 +, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -16,18 +16,18 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.5"; + version = "3.6-DEV2107"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "V${version}"; - sha256 = "1lyd0b2s3s9c2ppj7l4hf3s4gfzscaaam2pbiaby714bi9nr0ka7"; + rev = "v${version}"; + sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d"; }; buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb-compat-0_1 + qtconnectivity qtcharts libusb-compat-0_1 gsl blas ]; nativeBuildInputs = [ flex makeWrapper qmake bison ]; @@ -40,9 +40,9 @@ in mkDerivation rec { }) ]; - NIX_LDFLAGS = "-lz"; + NIX_LDFLAGS = "-lz -lgsl -lblas"; - qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; + qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "${zlib.out}/lib" ]; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri @@ -52,10 +52,6 @@ in mkDerivation rec { echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local - - # Use qtwebengine instead of qtwebkit - substituteInPlace src/gcconfig.pri \ - --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT" ''; installPhase = '' @@ -73,6 +69,6 @@ in mkDerivation rec { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; maintainers = [ ]; - license = licenses.gpl3; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 57f6be40ab0..42b886e4c72 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -19,7 +19,6 @@ buildGoModule rec { description = "A simple text-based Minecraft modpack manager"; license = licenses.agpl3; homepage = src.meta.homepage; - maintainers = with maintainers; [ foxit64 ]; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index d28a12396ee..f281ab5a4cb 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "03l5w0fg3laiz85k4g4w98ngaziyfr9s24xshjrfl71q6r9s813m"; + sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index f28292cb2f1..8f984db7df5 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mako"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0f92krcgybl4113g2gawf7lcbh1fss7bq4cx81h1zyn7yvxlwx2b"; + sha256 = "sha256-RcPwZ5NeO9vxwPWfgj5x3wVdCYGKumnYT3ngHEAWfW0="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index b02abc2f229..0845299c55b 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "3.1.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "1bz4wjl8zydw46bh2mdbrsx8prh2fw0cmzqliy912fdz5aal2b74"; + sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index 045f0db42fe..967c3db4c65 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,21 +1,22 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.5"; + version = "1.4.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo"; + hash = "sha256-oEcSW7UIeiGY2fCPJQ5EtDBRtd73Q04HaSk+7ObLKJc="; }; - appimageContents = appimageTools.extract { inherit src; name = pname; }; + appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 { inherit name src; extraPkgs = pkgs: with pkgs; [ libsecret ]; extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix new file mode 100644 index 00000000000..9567b051f59 --- /dev/null +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -0,0 +1,41 @@ +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: + +python3Packages.buildPythonPackage rec { + pname = "nwg-wrapper"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8"; + }; + + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + buildInputs = [ gtk3 gtk-layer-shell ]; + + propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ]; + + # ValueError: Namespace GtkLayerShell not available + strictDeps = false; + + # No tests + doCheck = false; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath [ wlr-randr ]}" + ) + ''; + + pythonImportsCheck = [ "nwg_wrapper" ]; + + meta = with lib; { + description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors"; + homepage = "https://github.com/nwg-piotr/nwg-wrapper/"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index e842046dd0b..b894195cfa6 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "00xxrssa3gbr5w2jsqlf632jlzc0lc2rpybnbv618ndy5lxidnw0"; + sha256 = "12n1a9j61r4spx0zi2kk85nslv11j1s510asxqvj92ggqhr2s3sq"; }; - cargoSha256 = "0kkhj58q1lgsyj7hpy3sxg1jva9q51m0i7j60zfzhnjnirwcd0h8"; + cargoSha256 = "12zachbg78ajx1n1mqp53rd00dzcss5cqhsq0119lalzc8b5zkrn"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 5e489bebb25..65ee6a65593 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -13,10 +13,10 @@ py.buildPythonApplication rec { buildInputs = [ pythonPackages.wrapPython ]; + dontConfigure = true; + dontBuild = true; doCheck = false; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - unpackPhase = "cp $src pdfdiff.py"; postPatch = '' diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 2e3f3230512..aad2a4d0e48 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -36,14 +36,14 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0afiyr2slg38ksrqn19zygsmjy9k5bpwv6n7zjas3s5djr6hch45"; + sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 099813483a4..b3b71d87608 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,5 @@ -{ cairo +{ config +, cairo , cmake , fetchFromGitHub , libXdmcp @@ -29,87 +30,87 @@ , i3-gaps , jsoncpp -# override the variables ending in 'Support' to enable or disable modules -, alsaSupport ? true + # override the variables ending in 'Support' to enable or disable modules +, alsaSupport ? true , githubSupport ? false -, mpdSupport ? false -, pulseSupport ? false -, iwSupport ? false -, nlSupport ? true -, i3Support ? false +, mpdSupport ? false +, pulseSupport ? config.pulseaudio or false +, iwSupport ? false +, nlSupport ? true +, i3Support ? false , i3GapsSupport ? false }: stdenv.mkDerivation rec { - pname = "polybar"; - version = "3.5.6"; + pname = "polybar"; + version = "3.5.6"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-Uvj9V2M/uQxyziTx1hecrcaQZECijlpVmWcUeT+PqrI="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Uvj9V2M/uQxyziTx1hecrcaQZECijlpVmWcUeT+PqrI="; + fetchSubmodules = true; + }; - nativeBuildInputs = [ - cmake - pkg-config - python3Packages.sphinx - removeReferencesTo - ] - ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; + nativeBuildInputs = [ + cmake + pkg-config + python3Packages.sphinx + removeReferencesTo + ] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; - buildInputs = [ - cairo - libXdmcp - libpthreadstubs - libxcb - pcre - python3 - xcbproto - xcbutil - xcbutilcursor - xcbutilimage - xcbutilrenderutil - xcbutilwm - xcbutilxrm - ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional githubSupport curl - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional iwSupport wirelesstools - ++ lib.optional nlSupport libnl - ++ lib.optional (i3Support || i3GapsSupport) jsoncpp - ++ lib.optional i3Support i3 - ++ lib.optional i3GapsSupport i3-gaps; + buildInputs = [ + cairo + libXdmcp + libpthreadstubs + libxcb + pcre + python3 + xcbproto + xcbutil + xcbutilcursor + xcbutilimage + xcbutilrenderutil + xcbutilwm + xcbutilxrm + ] ++ lib.optional alsaSupport alsa-lib + ++ lib.optional githubSupport curl + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional iwSupport wirelesstools + ++ lib.optional nlSupport libnl + ++ lib.optional (i3Support || i3GapsSupport) jsoncpp + ++ lib.optional i3Support i3 + ++ lib.optional i3GapsSupport i3-gaps; - postInstall = if i3Support - then ''wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3}/bin" - '' - else if i3GapsSupport - then ''wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3-gaps}/bin" - '' - else ''''; + postInstall = + if i3Support then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + '' + else if i3GapsSupport + then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3-gaps}/bin" + '' + else ""; - postFixup = '' - remove-references-to -t ${stdenv.cc} $out/bin/polybar - ''; + postFixup = '' + remove-references-to -t ${stdenv.cc} $out/bin/polybar + ''; - meta = with lib; { - homepage = "https://polybar.github.io/"; - changelog = "https://github.com/polybar/polybar/releases/tag/${version}"; - description = "A fast and easy-to-use tool for creating status bars"; - longDescription = '' - Polybar aims to help users build beautiful and highly customizable - status bars for their desktop environment, without the need of - having a black belt in shell scripting. - ''; - license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; - platforms = platforms.linux; - }; + meta = with lib; { + homepage = "https://polybar.github.io/"; + changelog = "https://github.com/polybar/polybar/releases/tag/${version}"; + description = "A fast and easy-to-use tool for creating status bars"; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. + ''; + license = licenses.mit; + maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 1d1aed3c926..491e889f242 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby, sd }: +{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: buildGoModule rec { pname = "slides"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "15f4sn1zsqqhzxnmwb1igh8xhka6li31ygdqgbjvxzm93lkarxvs"; + sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk"; }; checkInputs = [ @@ -16,7 +16,6 @@ buildGoModule rec { go python3 ruby - sd ]; vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index a56a09a8e34..576d66659a3 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "16g7dzvjcfhaz52wbmcapamy55l7vfhgizqy3m8dv9gkmy8vap89"; + sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA="; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 5e7765a16fd..9b40c4c44f1 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -26,9 +26,9 @@ buildPythonApplication rec { sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; - nativeBuildInputs = [ intltool wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ]; - buildInputs = [ makeWrapper distutils_extra ]; + buildInputs = [ distutils_extra ]; doCheck = false; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 3f704e8dd85..e41bc6bd20d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,31 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.13.0"; + version = "unstable-2021-07-10"; src = fetchFromGitHub { owner = "getzola"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yTvFQWmNxoB+CNZLHGmzJq7mKuOUxUqV4g8PWlOlRbM="; + # unstable because the latest release fails to build + rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1"; + sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA="; }; - cargoSha256 = "sha256:19vijhcs1i02jhz68acil7psv3pcn0jzi1i4y2l05i4m3ayxivjf"; + cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4="; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] ++ lib.optional stdenv.isDarwin CoreServices; RUSTONIG_SYSTEM_LIBONIG = true; postInstall = '' - install -D -m 444 completions/zola.bash \ - -t $out/share/bash-completion/completions - install -D -m 444 completions/_zola \ - -t $out/share/zsh/site-functions - install -D -m 444 completions/zola.fish \ - -t $out/share/fish/vendor_completions.d + installShellCompletion --cmd zola \ + --fish completions/zola.fish \ + --zsh completions/_zola \ + --bash completions/zola.bash ''; meta = with lib; { @@ -33,5 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir _0x4A6F ]; + # set because of unstable-* version + mainProgram = "zola"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 2768e31bd03..7a91b74c83d 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -19,14 +19,14 @@ for entry in feed.entries: continue url = requests.get(entry.link).url.split('?')[0] content = entry.content[0].value + content = html_tags.sub('', content) # Remove any HTML tags if re.search(r'Linux', content) is None: continue #print(url) # For debugging purposes version = re.search(r'\d+(\.\d+){3}', content).group(0) print('chromium: TODO -> ' + version) print('\n' + url) - if fixes := re.search(r'This update includes .+ security fixes\.', content): - fixes = html_tags.sub('', fixes.group(0)) + if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 33f31b15d03..6860612b888 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "91.0.4472.114", - "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", - "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", + "version": "91.0.4472.164", + "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", + "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", "deps": { "gn": { "version": "2021-04-06", @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.93", - "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0", - "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800", + "version": "92.0.4515.101", + "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd", + "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0", "deps": { "gn": { "version": "2021-05-07", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4557.4", - "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9", - "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd", + "version": "93.0.4573.0", + "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck", + "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1", "deps": { "gn": { - "version": "2021-06-25", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943", - "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" } } }, diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3410ab5a25c..12c76c8e4dd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "89.0.2"; + version = "90.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ach/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7de9c1dc38a4508aeca588a6ad49ededef067fe7589b099f1e4bdda2dfc99d60"; + sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/af/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bdff1c8983f94e4f9237cfbbeed6a9e10dabd029e3f4efaf9f8ed0d4cd04db6d"; + sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/an/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f2e1157d325a91d41600db763dedbf2344dbcb07c1af04ba02079a3c134a76b5"; + sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ar/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dc65f87a192c5940053e1d696f0b82dd9c4dfd4e1b9ffa70e7e608bd81622e53"; + sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ast/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "96305dcf9c86fa8357fc691ace8496916effc32896416e3507263e740256fe00"; + sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/az/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8f5a0a0050bbd221700d3dc65b749393d855ac0b93288d498ed6911aa727f577"; + sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/be/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "cad622598b126c17049fd2c18cb8c5cfc0b08a41559b872d2cd474eedd8cc64c"; + sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bg/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "60dcc88ee1532178b601fca3fa1711b83ef40a58f38ecdbd2abf504a74650f51"; + sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d8d48d57861c369631762141ff3230ea6877d1cfa25ab445ff8482c3505336ef"; + sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/br/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "93753f265ddab79e1632b17a39ff009d4b0831a57b522fbd042b85ac1b0e4526"; + sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "e0f253a239e7bbd89d051377ad3250160154568f92ae7ca7e813b202fb3ab2af"; + sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca-valencia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7aee988a5af50bc98cd9d8ec7beb2c4dcb7183a736be1fc47b5535280a20f7dc"; + sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "ce9617a904bb05391525af0eb6119f333a04d01ae6eecc60096d1bb159296933"; + sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cak/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a20708a942536373236c784a93d67a53623dd389c42167d09ddfd2577456d5b4"; + sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4d40e2d2f8bb1d3a3c2f7319dec6106b1781d717d430bd6e75db3cd8b12af31f"; + sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cy/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0b7dc949e79d29534651b450c29b9e7458817e4286cdbf7a8602855b5c0057a4"; + sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/da/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ab37e800cb1f5ced51c3fb18534200a5d68586a31f649d6c7d5e475ea2bc28a9"; + sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/de/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6233b625e67bbbc5432daf596e4e654dbecb02e7f8a5511f07f6ab015a07ecdb"; + sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/dsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2468c1b03785a381525e4fe58ec106337ae8414a3d46894b7a00fc81c1859ba3"; + sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/el/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1a77f00567ef8a255a012a33c8ca2d66e0b1ee379c555b110cc660846262e482"; + sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-CA/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f94fe35737d04152809893a775e411d8d92503addda508414c0d8ddc3d40e513"; + sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-GB/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "bf610dacccf834f4f62c96215e8a9620493d08ef2b2445b675ddef36c1eba036"; + sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-US/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "964b6b515151bb9a0f4e90e9902afd09ff64bfaafa231480b9829264d36fd76f"; + sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eo/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e2e4da131a01355c4cc6710ef04b61963609026455d4e8bb51c2675ac44d4a94"; + sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-AR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7d5ef9dc2667570752b65cadc3851dda050afad82b9af8de35565d7c56b9dfe2"; + sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-CL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "018f07814bf6ddf7891a1c6104ddf6f10dd0bb9595772a367fc0f66b0f1586a2"; + sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-ES/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "9076d5dfd5422a298b7f35b15d57a7793fc4a84c5acfca02157ae37234a7c526"; + sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-MX/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "dfddfbff84b42948ddff2527a819d0e3ffd4272c705a5a9d503b5034e4355ecb"; + sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/et/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3f05022e625074b79e7902b1b43ba141c0b39af65b247eb63d80aa38e7d7df56"; + sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9996e2133fdb56856bb744b439cba4f2570e7e2f6c46373c75d967412b8fefc3"; + sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fa/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "2a8d3de485d4ab1f2689f50fa06c40653690b7039617c5286b89a5e1483537ed"; + sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ff/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f4efb3e0bc68ae3a905b0e846e6884b3209a3557cef9de9bf43b52987d4b01c3"; + sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5d1a787f6d9798d0cbc58b0dbf3fc20892d7dbc0ee1ffaa5a26879578fe8a030"; + sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c07643b687f699f92c4a3725ad3589f9dbd8ed7ed859e49cc8d8f39242cb6b56"; + sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fy-NL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3cbf0aa2f6fd2842c11b2d774348dc7656f92e78c1dc15e351b30e772a7e3e6f"; + sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ga-IE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e0a307dff5bee1049446b9657036e336a2d7ab5b8fe9782b3ca83aef595be307"; + sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gd/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2ac2e6e617d93df8ca5c3166da944d897940dff279ba842d20b197ed15744971"; + sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "359870aa13c2dab4d79bda23c13a43cd899d0fd732089cbd75d44ee2a23ec0c9"; + sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a39e9ccb2d9b6b7f0e9303134a1c8e7081e5d56c1039d734fd390810efc7729f"; + sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gu-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e621ffee06c2858633505693c3f7da980a3b69d053d641cf796d85d53dd68af6"; + sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/he/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8258e2b3e70a1c7ad5ca5c49d482b0dca13f61f0ee7c91f1cb4df704e950db5e"; + sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hi-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "1a01c93c3cd83b756dee3a7984187821bf1cfc30460e8ff84cf934f549b0d2ba"; + sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b896ceaebbe84e015fa69a02c484dce61358ecc08be81915e944e11fbbb3361"; + sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c25fd4d7941e03190bf2472297beb9622825759752e24cde982e1ba5ace2d1dc"; + sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d8588d5540b85daf24148671781ea9ff814d550bb2bc4f5b42c58480ec73edb2"; + sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hy-AM/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e965b9d0c419d930b5d32e5fca9feaf5498c79b862d86890775625bfcf6d4c61"; + sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "ca72f852352f39332a8483cd8a237bd341fc5a59dd9691a611e3b376339e9214"; + sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/id/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "cbce57ce7feebde4bfaf1cc9fb32dbbac93ccbfca3a8bc0f78654825becece21"; + sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/is/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "469b8167124a958e8d63ac1b1e71936a586e887c747753be484f5761f41c3ac2"; + sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/it/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ebaab65016d9c3a5e04d48589b1ed98d3ce8dfd0fcf1a47c301b35859602ad71"; + sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ja/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ca67a104f71c48d61dbf6edc927c4081129aa66f48dfd504edb1ece7a9e2277a"; + sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ka/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5b5c42725b471cc505a9b87786fd3197903703235495ca81d87c19d96627da45"; + sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kab/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0fe867e946add17cfa0d7b55c8141ba2d01d1f369df8ad4afa40c6ac723d13fc"; + sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0f2cbf77404aefedae1ef092da3b55ce3f5f781af8a9e7017a458fb535b23ce4"; + sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/km/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "1bc3a6e917ad851cac0148788da0c74fd3879732aeae5c188d964d2cad4b3c15"; + sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "77fc84153e242e6f07cce2ed4456e7bb9556ddc1048469ae6dbdec99cc8e96c4"; + sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ko/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5eda0b318f39eedf6982aaf7965a086372e0750a3acd711d4b7474325216b2da"; + sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lij/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "393223aa925d239bb690b910144a702b46be7e8e256ab52b246e1372e7f89275"; + sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lt/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8cac447febbe03018759b56f2e96ce07f78c464aa0da3ebf17fc731da0602b46"; + sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lv/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5c000888c60575410a8a851bc2ecddbc981c512683411a1d0792e43e07da0c71"; + sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5bf30fa470ad03c9447ea3e53fde900e8a2f51a607066ab50c713a93cd6e9b06"; + sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f842218097dc96dfed8726d971a1383dc60e9054f7f974879e88dbcc615daaf1"; + sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ms/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "dcff05df156a85049712eaf31a5f7676a047c94562529a9cfcad7320f3fcc4c9"; + sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/my/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f6b159ae83c05440c0d3e2fb4af26b63df4a776702a5afbef837f0846faf41e1"; + sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nb-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9a3520ab261ba3c5e599ee04e2a6d494ec6471b8ef1dec266d45ecd530bb1a85"; + sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ne-NP/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d73479851c04957855f3ffa90a14d40ee249ad61013ac101491d1d60bd9ee310"; + sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "91fa566bc4fb42633e8e0a1ce8cb4c5ae9a3f730d3b4541ec128ba83319320c8"; + sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nn-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9e46ca01cbe183474b1fb3e5d59e75629bb272472c0aa3a781fe7e47723a90f7"; + sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/oc/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d5a208d52747413ef2adbbfcbfd7264351337ee57e53aa3817857c0a996e37ac"; + sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pa-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d79022a314255210a3eb97f82b9653a20612dc871d6c418afa1a7e0fe63d274d"; + sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "accad8da9a17749f43c676a69391b5b33a9d024624783228eef7ce48af56cb45"; + sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-BR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6f9202ef11e2d4368ccd0d6d98daa62ddabeab51087b84fe340bd935fb754f36"; + sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-PT/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8020109a785542a33f3139fde8b0cea5920ac1618ffceb96bcaa81627c5da772"; + sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/rm/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0e97d8aa72831ca0ec8d33f6877fa904bcc2f7ca3795bee85121ce5589388e97"; + sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ro/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6cb71deb1f0b9d42b20d9400d6789b7b9b88a057f505a68491ab493eca0f4313"; + sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ru/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a492308ff61a2b4673d178caf47e480376bb6b96ff8965a360f6f49321ee51e2"; + sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/si/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6858b2100d235dd7770ec003a4e9c2374354ad9f3a682aa9afd2c95ec2b81ff7"; + sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bf74268fb305ff461e118641cee1b26ba687d9dda294284b2a5d4c7f6e5bb39a"; + sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fb2ea5d4b1fa4c7eb88806efed2b3a0c724c5d81f716b54c015d7d976c457f5f"; + sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/son/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "75e6a69bf9ca85c1d214202de55f0b5c831b41c22d375448db6eab3f7161779f"; + sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sq/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bbe1935033db10b0004c7746b089040decafc0cb04825a5df5004905dd470320"; + sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cd97fca2ee3d57c418e0bbdad529c1ec424d18a0aa5976a4cff13fdb7bcb3f39"; + sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sv-SE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a3eeca622d63db7fd94fcd691a2d910380e211bb0d78d131587a448df6ebc635"; + sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/szl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "72c868394c285d890fbdc560813803aa26ae5342f36a6864588a829cf4639c09"; + sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ta/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c87f9e8d7f5935c30f9a916fb76990d0678e9032287fffad48230d5f66aed24d"; + sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/te/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "2d415574a612f011c22b782e439025d1a50ef12217bd3b538ff36010747f1eea"; + sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/th/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7c73cff2af72421231b9a03d3196186db98ce6b09a0ccf4954219506b50c27cd"; + sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6a37fae3a5c0156827f6b69aaa068aca6982cab7e6dd242f74846e743c00f96b"; + sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "42cd3896f2b726cff21ce0cadd4135ae1f325dc3102efa17cd3a3c5c6948c6f6"; + sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/trs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1ccf3ce127603a42fc5addcbaa238b36e9bd798615a2e6bfc95de7db5d12402e"; + sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2ad2a6306019dd5960e4e25ec59c7fb2eec0c233f07c04930049d5d75f3b84f5"; + sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ur/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e63605011a8cef5e239a39a21edce7b1e2bbf342827888e1ab36c22bdc6ac5c3"; + sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uz/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8f5d446ce0dac4bfb0640a492de57d087336578c157c238a8e3e9f186408e337"; + sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/vi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5f62f1e64035a158883e7e774cb87cf15b336bdd2171ffd65e13ea8cc81c5542"; + sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xh/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ff111b178134fd2dfc6f7597b6c33b4a8ed4aa6ef64c6687bcedfcef26982d5c"; + sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-CN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "90af3045eae839ca67a42e8ff810156ebe6115c3749e0547e907ca910eef3ef1"; + sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-TW/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5285b29bd463013c80cf23db6947cc720c5327a71a9dc35e678444e7ca2f3a42"; + sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ach/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0de413f3533dcd0fb5d2fdcf63673d814afb611324cb32fe9431f59b735ab152"; + sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/af/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "98069b18e97b3fb887d191321bed74935def28a4288abe8765c27acb62812ba9"; + sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/an/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d84d8c1ec45d53207b48043b8f468bceb211b199a3a5e76337700ec8b5f40f04"; + sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ar/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "22dea08d8f9d100881d9a3e5b56d2618502d6d498ea56ad7cc6afa8e862bc7e1"; + sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ast/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e92ea890c51def74523dadae1f40f1fdac4816db50025e12a6575d798febc1eb"; + sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/az/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "abb1a31a0374b95fa3ad36fea893c39dd8056f8a06e4d94dbfced3d80bd8197c"; + sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/be/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c5a8895155b3e4cae1c3541e66b3e551b3c14460d2e522ba72d83b5d702a8889"; + sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bg/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b6b811ed0e53795623f6c928d0411600aa2ccdfc9fa890e846018e085bbcc6ad"; + sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "4597c3c41daa76c3bdb30d3fcb4cfbc51a7571bab98abc8b35f6b7ae2df1ae5c"; + sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/br/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5346306c5cdfce1b3d7ece50ea1fe3dbe9ae69ccb83f70a0a2c451972ef40afc"; + sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "260e08c62ea7fd0d6d130453e1247588c83f4e0414aa569dc23f100bdd534347"; + sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca-valencia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "855660233c59d97b05e56dbc2efcaa1ab538c1433ea14e2159d3efca8531ecef"; + sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b71bf5b2137a715fc75c36d9ee9c1e20525f31b8a2f2dfa56af51305a94058c5"; + sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cak/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "fbf2092e4b56716042f993eb4d5bf41a9518da2243245282c9cfbc812c8c5268"; + sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "466a81994a51fc42ff2b936a2e2d20089524bb514031f740f7a6a0865ff57b1d"; + sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cy/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ef3596c10627fdf196a5f52f59240fd85d6eab33035cce708613c7dde041b413"; + sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/da/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "946b42c16cb861b21a0a1808cfdf554c955998aebcf59299c240a334abb8aa47"; + sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/de/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b4d003e8abd272870ed332448aef29bf2bb40de74ac0640912a65031da5012c0"; + sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/dsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "57c7b439616ec7eeddf05c7c5a5fde0947092762c5d5f98e87c3850a3ee768de"; + sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/el/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3c444a23416b6080d2d6b5e8744651b4f4796e3ecb601c8eee3f21cca8eaf224"; + sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-CA/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "aeb3d01315db024984739999b9fbf1eba0464a7a393451d311fcee786509198f"; + sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-GB/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c327ce261f0c843eb6a50c7e6ef9d3163548d03391429f9a55c1adc6b9969759"; + sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-US/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "491fd0066a893fdb3a6cc58e3e0b6b02f15096d07563437a79b2727d09256890"; + sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eo/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1c39ec1e448288541cbdcc10f7d66e8c36a66d08b1eadd9f8f90e590f6473908"; + sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-AR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "fa8dea8cecce162a25ae9d2640b35ab5f9f2073c136d051ee4795caf8f888aaa"; + sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-CL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e156fd02f2c1c8deaf416f17d78dea0433e0e84967b09233ceee9e33cbe42bbc"; + sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-ES/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "7359fc86b0f6da2916e8f178295c85ed3c8abebc1732f7735ec7b2f4c2aeb76f"; + sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-MX/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "57bebe4dfd2812c8b48f597893738b0cf9badbdb11fe1e3cfeae45290dae7f2e"; + sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/et/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "71e3d1a1bf3a8d480cde7cf8ad747c90b8eb217cadb445ae1ed3aa10c1232275"; + sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1e38c53105664f6dccca1b67928222f161c6de37f9a661c46a8ffafea3600cb3"; + sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fa/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b72165e2561de0d65e6cf991a4f5e4ce72fffabb23d80f3b7408c03e1eb6d0c3"; + sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ff/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9f2d7b11c3a05fbffee4d4e9dd5f3b397fdf3edcdee174a0907b1ebb1625ea62"; + sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "29e2279d03732703576c0dd43afabe1f416c14d517979f6dde78ab42cb561d4e"; + sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "93bda1a56ecce4dfd84fb9333f3b333887e2014edfdae4b555b6a4296baf4805"; + sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fy-NL/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1238d1e763457d4e9cabd00505cce7ce3dd9979e41ff1d1b005e35a229d8dce6"; + sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ga-IE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8eca1fbd8f536f62eb645ddb5cfd5e9c573492ef7a86f86a930b3a09829eb9c2"; + sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gd/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "dc173ac67ad7353229ee1c606ebde73c4be2ccf64ee97f3746e45a2766031e63"; + sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "038bd87c6c72727d6f535b863279b03d6e2c979672d717556222b280327cacf6"; + sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "42f4d4fadeacdb003db6104c0003cdec7ee81558d07b11573e7d0fab9351dbc8"; + sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gu-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6dfa19890282d88605585a5d5c640d200d52d8c0bc61218fc2e8f19d16a9811d"; + sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/he/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a16c0423c33f6f05f9a1aa607232506e7353e2774d7edc224e3955813d212eb7"; + sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hi-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fef5a9c06a3befcab35a0532cdcdaa3c6757a5ea5b6bc0d4ecbc684f37443077"; + sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "464ebe80e2d55686a56960f6a6789b58127e86efb5bf7dd8ab79220f49790659"; + sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hsb/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "92458b19e0a3a8c573a126f120d3da76f185d9822c5f32c3d56f3cc90d999f55"; + sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hu/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9c078d9022a2d83444709fec7a4a122369ceaebc4b27b99bbec9c67be4370ec4"; + sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hy-AM/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "36b64295d46fde7a85994e374b38a8781bdebb4e15872f81c8e694b4218e2713"; + sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ia/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "080f890f868a4c7e7f03db96ab2c25b6f39dcbb1f960052ce75dbdd5983487a0"; + sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/id/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b43ceb1d6f6a003aae01a02af15c0e4aa0fe9e8547703adcd872767c2c797717"; + sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/is/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "35edad7f2a31b7b2ffe0d8eee2b0f0ab94f5f91c8b2507b344b7d28ac13fbbbf"; + sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/it/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "47f17fe75d1ddd17a4c044dce4dc223a69da7f7de478b87d58e8f99d488ccf79"; + sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ja/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "86850b09c992a6383a406e99bc8698b8471f8240cef752126714e6f070e2b220"; + sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ka/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "42297e2f4c1d72bc46dde66ddca934962b2aee9a918e24b90870fc5774284bd9"; + sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kab/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7f00172ed2f2285ef5b8ed3774781f5036c1cde57f1a321f9b91c54679ef68ce"; + sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f7046b78d72074fcf0f62c7d4b660cb8a63095dcd8c24fcdfc61c574ddfb42ae"; + sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/km/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4157455134722e29c8a039cc11cac68cff7ff9311405a2c71e30f982f12888c2"; + sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kn/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ea5812c8eb194be0e8335f48ebde884a4375df2513c9275ac551aa0b18580dc0"; + sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ko/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b25b99297a64c9a700d9dd285db01d6f859402f09b38b2ada3bfaf914c72ec7f"; + sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lij/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "2c875ea5c87840527e2dff471fcfe774e8ee4d01c764bf1d73da99d9e875f4ac"; + sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lt/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "27dc824ad230ea5f3cfaafa4024733de85e67cc1b6678aae64686b6a54042855"; + sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lv/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad865a647d9fa2b20c68ea2d597595aa9b03bbf40987e763d1225fffc91176cf"; + sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "85c556608247de5e02808f264c721e16f909c5299f6ff423ff0e594da87fccb7"; + sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1970b70f983bc985778537728b044f27325bfa89cfbea7e000e91e5e66fcea1c"; + sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ms/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ca86002d548f94414fae96a266818ef4038c06f7307be854a997c5ff4b3529c3"; + sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/my/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6e6af248e80428fc0314be80a66f5ab054437e119e17c84eca6e8ca9d34db948"; + sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nb-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1310663a3617f78245e46dee283a3932354b9774a39555849c342a0620fe48bb"; + sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ne-NP/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ffc16051f275d04978c1414f919cf9dcde219f998148c9ec2e4f63a7620243f8"; + sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e2a654e66edf777397c31ab1a6862a051071abae376f5d2ceb939ee7c86d90e5"; + sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nn-NO/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8b2ee4cdd6346b918a5de6c1191d48f5606f40414ab3332129b10614495e1f4a"; + sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/oc/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cd7bb8a640662df12a56cd15569ff8eb611db31a4df676427c1da94579a5a37f"; + sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pa-IN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "18ff5174c3ce73a2733c2f1ad579e9d87c249af5aa1f708c0437d11c720e7669"; + sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d187fdac08aa62958cf2238f6e2749de5b8701634b99757e043cba0218451a26"; + sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-BR/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "63c81069183b3862e2b379a5d6a816aa02338ac0c324e33c0e020f579d9e2ebe"; + sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-PT/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5d24712703b54d2e4aeb82a2ce95b9d937e58886574b80252450b7ede7120d23"; + sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/rm/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cb6bacee900a12c51960d2175caeeba96c57908d860bb0b64ee2529ffde284ed"; + sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ro/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "29d344efd66aae4645208746a1c8083ceed01ffe8b8c372e8e97885e385e3e19"; + sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ru/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "17b9ba80d6dc056fe774e1836533ebf44be27edf6123c3bb430a00b1f2a21d65"; + sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/si/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "781b6ccc99d8f886e6bdf103327332ada06529ab6b728ff4ec6bffb5d176abf9"; + sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "1895f1c5ac0dd749a3e37576c6a90f9b7c5f3f7e9eec24af2cb9a87dcb730127"; + sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b3f27a10c094a7d9e308ab0b2ccb3fecb94a8f596b45ace8f66f0dea628e68da"; + sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/son/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "376bab9502491c3946538e3b26b7a106895bd41de918cb268337af4ce58cd4ac"; + sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sq/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "572251b4b621551e7a2d889489c223fd4dc08b9b19242a2524ffd3cdec53dd01"; + sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "50e594b3857c7ed71bfdda5f6ad7a2460508d029055e5ba17b8eca3269659ae8"; + sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sv-SE/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b9dcabfa670c6a8f3de85558bf2ea83ff6741754e2eb9ea90ccab81b2f3abce5"; + sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/szl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "ffeb74d2b09595aa6b4d45b5e8587d5fb566188e8cce484bf6887eea1fb83f18"; + sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ta/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "410bbc5abf26f49a6e54c762d62ff91068cf95cbb12725a3bb3ce21911abf029"; + sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/te/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "fd8aec949b92d15e8b52b9d4ad069598e6ed732cfa90747b29539b9c36103f64"; + sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/th/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f10cdd31b1a0ca18f2fe945549b5c98997a3cf821974760363d3977f378449ae"; + sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tl/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5d0655ec55e4857884eb6e87a6bff8a1efc53e961bc525f6537a0caca6caef9d"; + sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tr/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c4fc2bf69b8df0bdbf0976541a3ff53090cf9cb6d44cb6c5f883cb805fb9931f"; + sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/trs/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "54fcae7123f16cc2956af67b13e3a0c43358e82c3ce4498f87f4cefed1333bf7"; + sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uk/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9eefa4110e1feb6bb4ac92470c89a3c29709486bebeff3b3f41479f59593b807"; + sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ur/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "81baf8cbd6c47468471729eb59529af660a3940c4d4795892922532304ff1a11"; + sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uz/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "29d49de5f1ff8c351b19936350a6448480b9dac6c206589dd681fc26f43e3f91"; + sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/vi/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "78dccd68c82b5e54a1bea87b47cf6fea80c82c8b07b92f82ed4a7c5216657053"; + sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/xh/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ce11b8aa7529f43ca7c2aeebba17aaf3b6a5b22dd543302122c71dd0ee9f6eb6"; + sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-CN/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "407a7e16d28fee88428ce021b7a7c63f1027e7c991652227aaa11223356c5af7"; + sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-TW/firefox-89.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1f500d830d6e465a2ed71baa1b0245fbf5eef9ab9098e9559553e2a9916cc733"; + sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2d2073b80b0..c7632ad338d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -12,6 +12,7 @@ , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 +, gtk2, gtk3, wrapGAppsHook , debugBuild ? false ### optionals @@ -21,7 +22,6 @@ , alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true -, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon, libdrm , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 @@ -79,7 +79,7 @@ let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; default-toolkit = if stdenv.isDarwin then "cairo-cocoa" - else "cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}"; + else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; binaryName = "firefox"; binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; @@ -139,7 +139,7 @@ buildStdenv.mkDerivation ({ lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ - lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ + lib.optional (lib.versionAtLeast ffversion "90") ./no-buildconfig-ffx90.patch ++ lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86") (fetchpatch { @@ -164,13 +164,13 @@ buildStdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk2 perl zip libjpeg zlib bzip2 + gtk3 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.pixman yasm libGLU libGL xorg.xorgproto xorg.libXdamage - xorg.libXext makeWrapper + xorg.libXext libevent libstartup_notification /* cairo */ libpng jemalloc glib nasm icu67 libvpx_1_8 @@ -182,14 +182,14 @@ buildStdenv.mkDerivation ({ ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation - Foundation libobjc AddressBook cups ]; + Foundation libobjc AddressBook cups ] + ++ lib.optional (lib.versionOlder ffversion "90") gtk2; NIX_LDFLAGS = lib.optionalString ltoSupport '' -rpath ${llvmPackages.libunwind.out}/lib @@ -224,6 +224,7 @@ buildStdenv.mkDerivation ({ cargo gnused llvmPackages.llvm # llvm-objdump + makeWrapper nodejs perl pkg-config @@ -232,8 +233,8 @@ buildStdenv.mkDerivation ({ rustc which unzip + wrapGAppsHook ] - ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ extraNativeBuildInputs; @@ -362,8 +363,6 @@ buildStdenv.mkDerivation ({ passthru = { inherit updateScript; version = ffversion; - isFirefox3Like = true; - gtk = gtk2; inherit alsaSupport; inherit pipewireSupport; inherit nspr; @@ -372,7 +371,8 @@ buildStdenv.mkDerivation ({ inherit execdir; inherit browserName; inherit tests; - } // lib.optionalAttrs gtk3Support { inherit gtk3; }; + inherit gtk3; + }; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch index c4187fcda39..c8d2028f30b 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch @@ -1,25 +1,22 @@ -diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp -index 10ac77b..0125d9b 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp -@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = { +@@ -66,8 +66,6 @@ static const RedirEntry kRedirMap[] = { {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", nsIAboutModule::ALLOW_SCRIPT}, - {"buildconfig", "chrome://global/content/buildconfig.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, {"checkerboard", "chrome://global/content/aboutCheckerboard.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, -diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index c83b3e2..d543140 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -40,7 +40,6 @@ toolkit.jar: +@@ -39,8 +39,6 @@ toolkit.jar: + content/global/plugins.html content/global/plugins.css content/global/plugins.js - content/global/browser-child.js -* content/global/buildconfig.html - content/global/buildconfig.css +- content/global/buildconfig.css content/global/contentAreaUtils.js content/global/datepicker.xhtml + #ifndef MOZ_FENNEC diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 01611fd41dd..8799764fe21 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "89.0.2"; + ffversion = "90.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "ffd98ab0887611c5b4aba68346c49a7a31a58150fd8bbae610a4d941c4cff0acef0daaebfbb577787a759b4c1ef3c1199f02681148612f4f5b709983e07e0ccb"; + sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.11.0esr"; + ffversion = "78.12.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4"; + sha512 = "646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f2fa787c17c..202821b0978 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -44,8 +44,6 @@ let , nixExtensions ? null }: - assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used - let ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; @@ -73,7 +71,7 @@ let ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; - gtk_modules = [ libcanberra-gtk2 ]; + gtk_modules = [ libcanberra-gtk3 ]; ######################### # # @@ -183,7 +181,7 @@ let }; nativeBuildInputs = [ makeWrapper lndir ]; - buildInputs = lib.optional (browser ? gtk3) browser.gtk3; + buildInputs = [ browser.gtk3 ]; buildCommand = lib.optionalString stdenv.isDarwin '' @@ -266,13 +264,11 @@ let --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ ${lib.optionalString forceWayland '' --set MOZ_ENABLE_WAYLAND "1" \ - ''}${lib.optionalString (browser ? gtk3) - ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' - '' - } + ''} ############################# # # # END EXTRA PREF CHANGES # diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix new file mode 100644 index 00000000000..6f5da5b92a6 --- /dev/null +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchzip +, autoPatchelfHook +, wrapGAppsHook +, gnome2 +, nss +, xdg-utils +, xorg +, alsa-lib +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libX11 +, libxcb +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libdrm +, libnotify +, libopus +, libpulseaudio +, libuuid +, libxshmfence +, mesa +, nspr +, pango +, systemd +, at-spi2-atk +, at-spi2-core +}: + +stdenv.mkDerivation rec { + pname = "icecat-bin"; + version = "60.7.0"; + + src = fetchzip { + url = "https://mirror.tochlab.net/pub/gnu/gnuzilla/${version}/icecat-${version}.en-US.gnulinux-x86_64.tar.bz2"; + sha256 = "sha256-bEapbQIcZXQ0Tip/X1Q0guowpr3wNDYsFbHGmTbc5mE="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + nss + xdg-utils + xorg.libxkbfile + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gnome2.gtk + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libdrm + libnotify + libopus + libuuid + libxcb + libxshmfence + mesa + nspr + nss + pango + xorg.libXt + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/{opt,bin} + cp $src/* $TMP/ -r + ''; + + installPhase = '' + cp -r $TMP/* $out/opt/ + ln -sf $out/opt/icecat-bin $out/bin/icecat + ''; + + runtimeDependencies = [ + libpulseaudio.out + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "Binary build of the GNU version of the Mozilla Firefox browser"; + homepage = "https://www.gnu.org/software/gnuzilla/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 3362948e98a..187914740f2 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { libarchive ]; + passthru = { + inherit gtk3; + }; + meta = with lib; { description = "Lightweight WebKitGTK web browser"; homepage = "https://www.midori-browser.org/"; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 816b986f883..240d9a972fb 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; + passthru = { + inherit gtk3; + }; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix new file mode 100644 index 00000000000..5c62dbb7e20 --- /dev/null +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -0,0 +1,135 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, flac +, gnome2 +, harfbuzzFull +, nss +, snappy +, xdg-utils +, xorg +, alsa-lib +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libX11 +, libxcb +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libdrm +, libnotify +, libopus +, libpulseaudio +, libuuid +, libxshmfence +, mesa +, nspr +, pango +, systemd +, at-spi2-atk +, at-spi2-core +}: + +stdenv.mkDerivation rec { + pname = "yandex-browser"; + version = "21.5.3.753-1"; + + src = fetchurl { + url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; + sha256 = "sha256-sI2p/fCaruUJ3qPMyy+12Bh5I1SH8m7sYX5yDex2rwg="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + flac + harfbuzzFull + nss + snappy + xdg-utils + xorg.libxkbfile + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libdrm + libnotify + libopus + libuuid + libxcb + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + mkdir -p $TMP/ya $out/bin + cp $src $TMP/ya.deb + ar vx ya.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ + ''; + + installPhase = '' + cp -R $TMP/ya/opt $out/ + ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser + ''; + + runtimeDependencies = [ + libpulseaudio.out + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "Yandex Web Browser"; + homepage = "https://browser.yandex.ru/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 1e44d46689f..757f39c5b35 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -1,5 +1,5 @@ -{ -lib, stdenv +{ lib +, stdenv , makeWrapper , makeDesktopItem , fetchurl @@ -49,16 +49,16 @@ let meta = with lib; { description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; - maintainers = [ maintainers.kalbasit ]; - license = lib.licenses.unfree; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with maintainers; [ kalbasit ]; + license = licenses.unfree; + platforms = platforms.unix; }; }; in { charles4 = (generic { - version = "4.6.1"; - sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv"; + version = "4.6.2"; + sha256 = "0r5rann7cq665ih0pa66k52081gylk85ashrwq1khbv2jf80yy52"; platform = "_amd64"; jdk = jdk11; }); @@ -68,4 +68,3 @@ in { jdk = jdk8.jre; }); } - diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index ed4ffffe451..374062f0d80 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.6.0"; + version = "2021.7.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-cX0kdBPDgwjHphxGWrnXohHPp1nzs4SnvCry4AxMtp0="; + sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 26e971b8c44..baf67f2b681 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.16.0"; + version = "0.16.1"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-r9Tg6aU8aIA87Mw+HFMdPe9uC+3bfGOnuAIrmB1nlRs="; + sha256 = "sha256-OjbyDg+3dSJco162NubK12pbmwib6uGlJQxVaJOzSig="; }; - vendorSha256 = "sha256-zaOOwgljqhmIXZPZSMgMsVi02bBqQOag+6uVhxKsu9U="; + vendorSha256 = "sha256-GPbuHv/Xi9sWWZ6SIlW8cm5bY1gTO41vygx2C8dEt0k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 85b6c623ae3..3c69fe05cfc 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,26 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "istioctl"; - version = "1.9.4"; + version = "1.10.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks="; + sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90="; }; - vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8="; + vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4="; doCheck = false; - nativeBuildInputs = [ go-bindata installShellFiles ]; - - # Bundle charts - preBuild = '' - patchShebangs operator/scripts - operator/scripts/create_assets_gen.sh - ''; + nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata buildFlagsArray = let diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix new file mode 100644 index 00000000000..59530f05457 --- /dev/null +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "k0sctl"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "k0sproject"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aW7x2XfeFU0z3lwPTsDHudHjdwTtfASgrbKGddVb6Rs="; + }; + + vendorSha256 = "sha256-bsXXWyeZXZLV6igEvyvPpS92FruGiLDx/5CCTKPe0EU="; + + meta = with lib; { + description = "A bootstrapping and management tool for k0s clusters."; + homepage = "https://k0sproject.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 878d7e1184f..dfeb61915ee 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,8 +44,8 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.0+k3s1"; # k3s git tag - k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version + k3sVersion = "1.21.2+k3s1"; # k3s git tag + k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION @@ -97,7 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; + sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch index 244da314f59..dd26810a456 100644 --- a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch +++ b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch @@ -1,21 +1,19 @@ -From 1891be119e298ef7c86347a6b74d40ff539cf06e Mon Sep 17 00:00:00 2001 -From: Euan Kemp <euank@euank.com> -Date: Sun, 31 May 2020 19:02:37 -0700 -Subject: [PATCH 2/2] Add nixpkgs patches - -These patches let us re-use the upstream build scripts when building for -nix. ---- - scripts/build | 20 ++++---------------- - scripts/package-cli | 10 ++++++---- - 2 files changed, 10 insertions(+), 20 deletions(-) - +-Subject: [PATCH 2/2] Add nixpkgs patches +-Original patch by: Euan Kemp <euank@euank.com> +-Adapted by: superherointj +- +-This patch allows us to re-use upstream build scripts when building for nix. +---- +- 2 files changed: +- scripts/build +- scripts/package-cli +- diff --git a/scripts/build b/scripts/build -index 4ca6333c4a..df15f7db1d 100755 +index 2f3d1dc496..4f4e5aa897 100755 --- a/scripts/build +++ b/scripts/build @@ -12,7 +12,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" - PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" + PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" -buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') @@ -24,7 +22,7 @@ index 4ca6333c4a..df15f7db1d 100755 VENDOR_PREFIX="${PKG}/vendor/" VERSIONFLAGS=" -@@ -92,17 +93,7 @@ cleanup() { +@@ -89,17 +90,7 @@ cleanup() { } INSTALLBIN=$(pwd)/bin @@ -43,23 +41,23 @@ index 4ca6333c4a..df15f7db1d 100755 # echo Building agent # CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go echo Building server -@@ -118,10 +109,7 @@ ln -s containerd ./bin/ctr +@@ -116,10 +107,7 @@ ln -s containerd ./bin/ctr #CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go # echo Building containerd # CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ -echo Building runc --rm -f ./vendor/github.com/opencontainers/runc/runc --make EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./vendor/github.com/opencontainers/runc $RUNC_STATIC --cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc +-rm -f ./build/src/github.com/opencontainers/runc/runc +-make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC +-cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc +# nixpkgs: we build runc separately echo Building containerd-shim rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim diff --git a/scripts/package-cli b/scripts/package-cli -index d1aad638d9..90479b6fa1 100755 +index ab4a6dac63..044b5587d0 100755 --- a/scripts/package-cli +++ b/scripts/package-cli -@@ -49,15 +49,18 @@ fi +@@ -50,15 +50,17 @@ fi CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} @@ -81,4 +79,3 @@ index d1aad638d9..90479b6fa1 100755 -./scripts/build-upload ${CMD_NAME} ${COMMIT} +# nixpkgs: skip uploading +# ./scripts/build-upload ${CMD_NAME} ${COMMIT} -+ diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/applications/networking/cluster/kfctl/default.nix new file mode 100644 index 00000000000..52a049ab1bb --- /dev/null +++ b/pkgs/applications/networking/cluster/kfctl/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kfctl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "kubeflow"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc="; + }; + + vendorSha256 = "sha256-+6sxXp0LKegZjEFv1CIQ6xYh+hXLn+o9LggRYamCzpI="; + + subPackages = [ "cmd/kfctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd eksctl \ + --bash <($out/bin/kfctl completion bash) \ + --zsh <($out/bin/kfctl completion zsh) + ''; + + meta = with lib; { + description = "A CLI for deploying and managing Kubeflow"; + homepage = "https://github.com/kubeflow/kfctl"; + license = licenses.asl20; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 4dc37364e7b..54d13f819ab 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -53,11 +53,6 @@ rec { mkKops = generic; - kops_1_18 = mkKops { - version = "1.18.2"; - sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp"; - }; - kops_1_19 = mkKops rec { version = "1.19.2"; sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9"; @@ -69,4 +64,10 @@ rec { sha256 = "011ib3xkj6nn7qax8d0ns8y4jhkwwmry1qnzxklvzssaxhmzs557"; rev = "v${version}"; }; + + kops_1_21 = mkKops rec { + version = "1.21.0"; + sha256 = "sha256-T2i3qpg3GC7yaYCGrN1V5XXrUyT+Ce9Q4aV00gQJ7gM="; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 7b5e5810581..9bd9a8e7a18 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.1"; - sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo="; - vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4="; + version = "21.7.2"; + sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc="; + vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8="; }; } diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index dcdf134b26a..dbbf6524871 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng="; - aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4="; - x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE="; - aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE="; + x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA="; + aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ="; + x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU="; + aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 4095a7907eb..e793df71a58 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.21.0"; + version = "0.22.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y="; - x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY="; + x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0="; + x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0="; }.${system}; }; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index a7778af231d..0db134bdb21 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,20 +2,18 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4="; + sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; }; vendorSha256 = null; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +25,7 @@ buildGoModule rec { # Some tests try to write to the home dir export HOME="$TMPDIR" # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden + sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden ''; postInstall = '' @@ -43,8 +41,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/tkn --help - # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389 - # $out/bin/tkn version | grep "Client version: ${version}" + $out/bin/tkn version | grep "Client version: ${version}" runHook postInstallCheck ''; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix new file mode 100644 index 00000000000..26967b7ed85 --- /dev/null +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -0,0 +1,43 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "temporal"; + version = "1.10.5"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "temporal"; + rev = "v${version}"; + sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E="; + }; + + vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM="; + + # Errors: + # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite + # gocql: unable to dial control conn 127.0.0.1:9042: dial tcp 127.0.0.1:9042: connect: connection refused + doCheck = false; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl + install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra + install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server + install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/tctl --version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; + downloadPage = "https://github.com/temporalio/temporal"; + homepage = "https://temporal.io"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 02372539b02..f7eb378e716 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -567,10 +567,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha", "repo": "terraform-provider-kubernetes-alpha", - "rev": "v0.3.3", - "sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl", + "rev": "v0.5.0", + "sha256": "0yqm3wlya69w9g9kzgvm28mbbwp6wik51syjnbnj8dis5kspx8gd", "vendorSha256": null, - "version": "0.3.3" + "version": "0.5.0" }, "launchdarkly": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 61e42ce22ec..b898ce33742 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,12 +1,13 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - pname = "FlexGet"; - version = "3.1.127"; + pname = "flexget"; + version = "3.1.131"; src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "25a973eb54f2f9ccd422d536b29038c570de3584b8174d993119e3c6b434cc54"; + pname = "FlexGet"; + inherit version; + sha256 = "sha256-wjMtCrffRhk7NL+Z0PeljuDc3WjVWSMsjWLbqo8qUjU="; }; postPatch = '' @@ -61,9 +62,9 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://flexget.com/"; + homepage = "https://flexget.com/"; description = "Multipurpose automation tool for all of your media"; - license = licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a8b2b02f0bf..2d67236c90e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -5,6 +5,7 @@ , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence , mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +, writeScript, common-updater-scripts }: let @@ -71,7 +72,15 @@ in stdenv.mkDerivation rec { mimeType = "x-scheme-handler/discord"; }; - passthru.updateScript = ./update-discord.sh; + passthru.updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/linux/} + version=''${version%%/*.tar.gz} + update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + ''; meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f7435aa3ae3..d2d8c9a3ec5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.125"; + version = "0.0.126"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; + sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io="; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/pkgs/applications/networking/instant-messengers/discord/update-discord.sh deleted file mode 100755 index 34c1574c65a..00000000000 --- a/pkgs/applications/networking/instant-messengers/discord/update-discord.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -# script to generate ./default.nix - -set -e -exec >"${BASH_SOURCE%/*}/default.nix" - -cat <<EOF -{ branch ? "stable", pkgs }: -# Generated by ./update-discord.sh -let - inherit (pkgs) callPackage fetchurl; -in { -EOF - -for branch in "" ptb canary; do - url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') - version=${url##https://dl*.discordapp.net/apps/linux/} - version=${version%%/*.tar.gz} - echo " ${branch:-stable} = callPackage ./base.nix rec {" - echo " pname = \"discord${branch:+-}${branch}\";" - case $branch in - "") suffix="" ;; - ptb) suffix="PTB" ;; - canary) suffix="Canary" ;; - esac - echo " binaryName = \"Discord${suffix}\";" - echo " desktopName = \"Discord${suffix:+ }${suffix}\";" - echo " version = \"${version}\";" - echo " src = fetchurl {" - echo " url = \"${url//${version}/\$\{version\}}\";" - echo " sha256 = \"$(nix-prefetch-url "$url")\";" - echo " };" - echo " };" -done - -echo "}.\${branch}" diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index c0e0c80b459..b6706d64786 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -3,56 +3,58 @@ , fetchFromGitLab , pkg-config , cmake -, qtquickcontrols2 -, qtmultimedia -, qtgraphicaleffects -, qtkeychain -, libpulseaudio -, olm -, libsecret , cmark , extra-cmake-modules +, kconfig +, kdbusaddons +, ki18n , kirigami2 , kitemmodels -, ki18n , knotifications -, kdbusaddons -, kconfig -, libquotient , kquickimageedit +, libpulseaudio +, libquotient +, libsecret +, olm +, qqc2-desktop-style +, qtgraphicaleffects +, qtkeychain +, qtmultimedia +, qtquickcontrols2 }: mkDerivation rec { pname = "neochat"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HvLPsU+fxlyPDP7i9OSnZ/C1RjouOQCp+4WCl6FlFJo="; + sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; buildInputs = [ - qtkeychain - qtquickcontrols2 - qtmultimedia - qtgraphicaleffects - olm - libsecret cmark + kconfig + kdbusaddons + ki18n kirigami2 kitemmodels - ki18n knotifications - kdbusaddons - kconfig - libquotient kquickimageedit libpulseaudio + libquotient + libsecret + olm + qtgraphicaleffects + qtkeychain + qtmultimedia + qtquickcontrols2 + qqc2-desktop-style ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index dc5a8739760..b5bdef03db7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -2,8 +2,9 @@ , gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream -, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn -, lib, python, libICE, libXext, libSM +, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn +, lib, python3, libICE, libXext, libSM +, libgnt, ncurses , cyrus_sasl ? null , openssl ? null , gnutls ? null @@ -16,28 +17,27 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; majorVersion = "2"; - version = "${majorVersion}.13.0"; + version = "${majorVersion}.14.6"; src = fetchurl { url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; - sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; + sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336"; }; - inherit nss ncurses; - nativeBuildInputs = [ makeWrapper ]; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = let - python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]); + python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]); in [ aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good libxml2 nss nspr - libXScrnSaver ncurses python-with-dbus + libXScrnSaver python-with-dbus avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl + libgnt ncurses # optional: build finch - the console UI ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) @@ -62,6 +62,7 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-meanwhile" "--disable-nm" "--disable-tcl" + "--disable-gevolution" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 6c7cdf675e6..01a8a71f032 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,14 +1,45 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake -, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca-qt5, libXScrnSaver, hunspell -, libsecret, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtmultimedia +, qtx11extras +, qttools +, libidn +, qca-qt5 +, libXScrnSaver +, hunspell +, libsecret +, libgcrypt +, libotr +, html-tidy +, libgpgerror +, libsignal-protocol-c , usrsctp -# Voice messages +, chatType ? "basic" # See the assertion below for available options +, qtwebkit +, qtwebengine + +, enablePlugins ? true + + # Voice messages , voiceMessagesSupport ? true , gst_all_1 + +, enablePsiMedia ? false +, pkg-config }: +assert builtins.elem (lib.toLower chatType) [ + "basic" # Basic implementation, no web stuff involved + "webkit" # Legacy one, based on WebKit (see https://wiki.qt.io/Qt_WebKit) + "webengine" # QtWebEngine (see https://wiki.qt.io/QtWebEngine) +]; + +assert enablePsiMedia -> enablePlugins; + mkDerivation rec { pname = "psi-plus"; version = "1.5.1549"; @@ -21,19 +52,40 @@ mkDerivation rec { }; cmakeFlags = [ - "-DENABLE_PLUGINS=ON" + "-DCHAT_TYPE=${chatType}" + "-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}" + "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ + cmake + qttools + ] ++ lib.optionals enablePsiMedia [ + pkg-config + ]; buildInputs = [ - qtbase qtmultimedia qtx11extras qtwebengine - libidn qca-qt5 libXScrnSaver hunspell - libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c + qtbase + qtmultimedia + qtx11extras + libidn + qca-qt5 + libXScrnSaver + hunspell + libsecret + libgcrypt + libotr + html-tidy + libgpgerror + libsignal-protocol-c usrsctp ] ++ lib.optionals voiceMessagesSupport [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ] ++ lib.optionals (chatType == "webkit") [ + qtwebkit + ] ++ lib.optionals (chatType == "webengine") [ + qtwebengine ]; preFixup = lib.optionalString voiceMessagesSupport '' @@ -45,7 +97,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://psi-plus.com"; description = "XMPP (Jabber) client"; - maintainers = with maintainers; [ orivej misuzu ]; + maintainers = with maintainers; [ orivej misuzu unclechu ]; license = licenses.gpl2Only; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9357a02a640..daf1c476e67 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.8.0"; # Please backport all updates to the stable channel. + version = "5.9.0"; # 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: @@ -38,7 +38,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 = "0icwmlnnnlsj2g1p2q4lf7hlhys3rakaim7bah5qkmhwkrzkk30y"; + sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix new file mode 100644 index 00000000000..e1b3cc4f775 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +, curl +, zulip +, p7zip +, glibc +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "vk-cli"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/vk-cli/vk/releases/download/${version}/vk-${version}-64-bin.7z"; + sha256 = "sha256-Y40oLjddunrd7ZF1JbCcgjSCn8jFTubq69jhAVxInXw="; + }; + + nativeBuildInputs = [ + p7zip + ]; + + buildInputs = [ + curl + ncurses + openssl + ]; + + unpackPhase = '' + mkdir -p $TMP/ + 7z x $src -o$TMP/ + ''; + + installPhase = '' + mkdir -p $out/bin/ + mv $TMP/vk-${version}-64-bin vk-cli + install -D vk-cli --target-directory=$out/bin/ + ''; + + postFixup = '' + patchelf $out/bin/vk-cli \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ curl zulip glibc ]}" + ''; + + meta = with lib; { + description = "A console (ncurses) client for vk.com written in D"; + homepage = "https://github.com/vk-cli/vk"; + license = licenses.asl20; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 16846580714..78cfa89e6d4 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -29,11 +29,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.6.22045.0607"; + version = "5.7.26030.0627"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0zdk02zq9apxnfbxwnlda9z8nqkqa1h1javbh9wwj8yy3y3a1lb5"; + sha256 = "1nooaafH+ajRtdrknXmFPclC4fJMpRTo+gBsaPHYfT0="; }; }; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index e28680c245f..5090b1fd027 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex +{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex , curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info , glib-networking, gsettings-desktop-schemas -# Use the experimental gtk3 branch. -, useGtk3 ? false +# Selector between the GTK+ 3 and GTK+ 2 releases. +, useGtk3 # Package compatibility: old parameters whose name were not directly derived , enablePgp ? true @@ -57,16 +57,15 @@ with lib; let - version = if useGtk3 then "3.99.0" else "3.17.8"; + # Last release and hash for both the GTK+ 3 and GTK+ 2 version. + version = if useGtk3 then "4.0.0" else "3.18.0"; - # The official release uses gtk2 and contains the version tag. gtk2src = { - sha256 = "0l4f8q11iyj8pi120lrapgq51k5j64xf0jlczkzbm99rym752ch5"; + sha256 = "1vsiy3xsppw4d8ylsz70wsyrvmgy88lp2hj7vrc353ckny80r9lh"; }; - # The corresponding commit in the gtk3 branch. gtk3src = { - sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; + sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn"; }; python = if useGtk3 then python3 else python2; @@ -125,7 +124,19 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./mime.patch ]; + patches = [ + ./mime.patch + + # Fixes a bug with the automatic authentication method, resulting in errors + # with certain mail providers. + # <https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4497> + # This MUST be removed for the next release. + (fetchpatch { + name = "fix-automatic-auth.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e"; + sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a"; + }) + ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 1428fa6a428..0c2ffdc7fff 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0dqd6gg1wwhxjgdfl8j0kf93mw43kvd6wrwrzkscq2wjrsy5p0w0"; + sha256 = "0jjjvqkqmpj55v111p1a1i2ry7mpd1bpphn1bhvlr18rgw7xdrja"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f3634b744aa..ae4999b4f5f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -41,6 +41,7 @@ , pango , runtimeShell , writeScript +, xdg-utils , xidel }: @@ -164,6 +165,7 @@ stdenv.mkDerivation { --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix PATH : "${lib.getBin gnupg}/bin" \ + --prefix PATH : "${lib.getBin xdg-utils}/bin" \ --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 82bf1800bb0..4b9e47aef5b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.11.0"; + version = "78.12.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/af/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/af/thunderbird-78.12.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "061da958c7e0b52c76cc3152cf541eabd855e7189f976b9743792e52ab733ea8"; + sha256 = "39671f52392f2c10c7398376047e01d85c42ca8eb21d2c536e11fa575cca4874"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ar/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ar/thunderbird-78.12.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "915ca02f6e7639adef01d8e332133762bd3f88df6a1c12e86a86c04010efcd69"; + sha256 = "b3ac3c166b5eec0ae3857a89817a0a7088dddd5545aa4864705caf79aa8bae1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ast/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ast/thunderbird-78.12.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "6a1995efbca69e251ca70af570b02d94a99f83ef7927d667f9f856febc53ff40"; + sha256 = "2a98210aef008bd04206eb4019d9b6d0301e21085d8c96e5d8f023c77b079900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/be/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/be/thunderbird-78.12.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "28c87eb1651bb4fd00d8b52b3f0a4e0520ceeed76305ea124915c238562f28a2"; + sha256 = "6309d4959ebcc9be6d139277f990562f8d912766d57d64fc3ec4078e214097cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/bg/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/bg/thunderbird-78.12.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "24bb2cd51bdf4e99fe88a13c70289f3896cb17c911d556150f1c6e216f3ef5ce"; + sha256 = "20fd0b411962c3ed0da4f6eb95d8c47dc57a7b366dee0e771708c2c67772619f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/br/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/br/thunderbird-78.12.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "473fe2acadfa6e4f6ba8eddcfd4377c3eeb583f6510461e6f51b9dcd89d36ace"; + sha256 = "e9f43ff375066cbb23340f2138c0ebf7b2c18e0a57d7049437034a580d8ebc74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ca/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ca/thunderbird-78.12.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d128adb596f6be2a940a2544ad653c812c177b3d08ddac7de716fc3ce603b71c"; + sha256 = "2eaf6674ea616116457b7100b90f2b813eab906091a53bce71d52f4bdae17fb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cak/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cak/thunderbird-78.12.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cff975db463997677d392264e55bd73a3c1a36e34991f8bcbb0673980f428589"; + sha256 = "f56dc013fad49782a074ef7d0721a12f43af5f029e690937d72e6a14d79c1505"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cs/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cs/thunderbird-78.12.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "90836d8c099594ca0e459d7d07232ab47d811cafc79ca5ad2999186f242fa8c2"; + sha256 = "87fecc8661be9ee8891b74f83bd9a6746b826700a6ac46b550d5e2bcc93e560e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/cy/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/cy/thunderbird-78.12.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "2a844b7afe834dc6e0ad291a6d5cb9ca0389d703f9a8ca385aabf5e5f012c4c5"; + sha256 = "4177b225e02341b96baa6528f1053c718e2e85d452b730a40ebf124a4c70d118"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/da/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/da/thunderbird-78.12.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a37075627a6955abfc15508d2bb4a16ba330a4c64c89f95084635319ad5106e6"; + sha256 = "9d8cb26a9011130ce973e9e7ecd20650296d406b7ce8b4cf8740ab7e9759e641"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/de/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/de/thunderbird-78.12.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6e03c8b0f791cc09b04b3114e8b44950de974beabf0563705af625ac1226dbb2"; + sha256 = "ee19d3702cd0fc0b193e09a3fc470c450ddc919d78471df071183c89c063f443"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/dsb/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/dsb/thunderbird-78.12.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "546f10d4653940798540797deeec54287cd1275b5ebf350661d49cd313228ddb"; + sha256 = "20d78a72fb2c5d91e2534dd21aa00d9f958d2df61bec297e1662d7f594c76a5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/el/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/el/thunderbird-78.12.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b6fa7ae657a03c4f91905e95931af05b9af588a067a03a3a8a0d9faa8d40b59d"; + sha256 = "c5014ec8b8382814e3184839192aa71e5610c8c0a6df8dfc9b6b596afbd22bcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-CA/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-CA/thunderbird-78.12.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5507e9b74cea95681a2c7c21cb5127a7369366bbdaa6a24dbafc7a4fbe11b924"; + sha256 = "79f1c4166607a01cb32eec5ddb60892822f9047f43c7af3cdeb877ba9c7b7584"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-GB/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-GB/thunderbird-78.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "fcaa2b652b43367fcb720e8386cdc92346318bab67fd720c5958e7ec236c0844"; + sha256 = "8dfe9daac9224dd4c64d689b7b066c126f72e75f283d8a66dcf3fa846e46c881"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/en-US/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/en-US/thunderbird-78.12.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "688a2f7274581fa4735a6d2f8166ba262999694889635bf3bc30ac77ad746fb3"; + sha256 = "43c021edf529f388856432315d99fd1261a0034aa1cead97cc104598eba63d7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/es-AR/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-AR/thunderbird-78.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "506a63de366968c6a3e66503def57e621cc2458ccf07ccc53ffdad72fdab8914"; + sha256 = "5f6f86557456d717790a16053e663dce8878a4e7b60f4ee15d02ae753b5c8e78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/es-ES/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/es-ES/thunderbird-78.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "974acf65d509929d6b8175ac99a2886f17d4dbc4a6b8d4ef50e82585e1ea9fe6"; + sha256 = "f6e85e580871e225e5315eeb0aa7f2982f43352c6c4065966ead1eff47037989"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/et/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/et/thunderbird-78.12.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "504c97962170388d6fe249c24b6f5a62025ebf9bf4b30b65fbfd3baf12756809"; + sha256 = "37ea60b93f1d57a1c5f30acdc93dcd73a35ab7107dc05b8e8eebe3a996454186"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/eu/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/eu/thunderbird-78.12.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b4c4bd5b228f2b945dc8f280b12a72dd68dff10562c4f19b5a27fa94a95d9128"; + sha256 = "9f7a1fc4b94017d6341c993209987e9647bf29973c3ffc3427ece6277cf92c5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fa/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fa/thunderbird-78.12.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4384d9579304ec344f616e00a51bebbf5038e212cc54d07586182fce9558af91"; + sha256 = "dc36f3eb91e32ea44a30792f8d65ed225455567ec4b7ec386fe6ec6510caa5da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fi/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fi/thunderbird-78.12.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "89bba8ff928caa79b8b1947be761388e441f01655f200f4a7fb9d9894b3ea4e6"; + sha256 = "1fa2cfe9354f7a5b4c9aa0927ae83cad535e8cb448d8a2d82f7a946b5c142b22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fr/thunderbird-78.12.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c2953ff1879ed8f80f6b9f1a26c08ba1f5969e8b47b81a3eb3ab690698142bbb"; + sha256 = "49887ce333f50f404a383291d813e3e8f891045247d2de353627998c47821a12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/fy-NL/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/fy-NL/thunderbird-78.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "58057f7bb143512c1171296413050178f0a7a0651513e7c67d153af5874aa382"; + sha256 = "e408da5478ea01797c260b414ff513e87e71c6de41d6ca0c8bc11780c06fad28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ga-IE/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ga-IE/thunderbird-78.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "94c070e79bba7a43f3fcc8b0b1759e424366f3ced72e2e53c5fe75689602a0ed"; + sha256 = "6dc99c43a076c4575163e640260b27aaebef01ffcc1ce8b6c6e2da8c993eee72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/gd/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gd/thunderbird-78.12.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a655074ab7d0f86318199ab32b77c889ccfd366f6a0d9d43b4bbeba54ae2ee1a"; + sha256 = "3ba9424491565e4e576dbfe656e681892ff1084fcd8b9659beb6a17b36cc4c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/gl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/gl/thunderbird-78.12.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2835735ebf7f518aaf8d16ca3cedd3e7f7414e0cc1177a185b6e896da7e2c87f"; + sha256 = "a8348d99ba729122d2d2cc0a10d60c38ff4b7e83eaf7ebd04a58d7fad5326664"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/he/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/he/thunderbird-78.12.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "804c359b76026631e5a0ecf40258782f24f0be4d34b700b2aa0532607e4c5651"; + sha256 = "fcba79332eeba50f074a7f1864120414ca20152a16b4b9aed02dbc05d487cf10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hr/thunderbird-78.12.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d7278bc20c7eb6c071648b639064338ae8cf7535476c0493b642d45c0ae9804d"; + sha256 = "d6a51f6c92ab53a73abb5733a9737d36f59aee7acd248ea656b7aa3c406e3980"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hsb/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hsb/thunderbird-78.12.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "fb520d80d1505b50b8d9e2a43c10512e001b120790c823eb41dcc076e68eca51"; + sha256 = "a99dbdd453d31674178faecf37e61b414cc24468a39b8a5e5afa037bf938ffd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hu/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hu/thunderbird-78.12.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "20639f623995f76b2f7d5f8d81e08145767d2a67d97fbd31542599abd4c80a57"; + sha256 = "aa8384952169ea4f60c8bb11d47c39b81a9c327546ceacdefedb1a37a91e80b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/hy-AM/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/hy-AM/thunderbird-78.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bf4c1fcaa9bf928607dade6d8fd16b47fff6c248c07ef86fcb20c0b3a6841ba1"; + sha256 = "2a3fd50c42b1aeea61e921e70f05c4ca74e03904c8400b7fa0e245816e42e0f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/id/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/id/thunderbird-78.12.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "03665c9cfdd39e8ebb568151a28ecf02e425bae4241de74bdb47a0f9f38e26ba"; + sha256 = "5b606b68a3f618ca0d3fadc5a8ee1da7aa636b6d1c1aee0b3e46c978c4a95ef3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/is/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/is/thunderbird-78.12.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1efb313ae0fc03d402f306ca0258ea4c784a762a642f947065e154c382e9135b"; + sha256 = "af75f627fc5eb5c0628bbc3ece9549c0daf967e267de850503314830384b340c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/it/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/it/thunderbird-78.12.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "95e1c07248c8ef1ab36b8a57729615a4f2ab9a4cb6148f1b0bca20554901ffca"; + sha256 = "de55f082a0de2c6a3f5c04e6a3bc00f4dd79dc4c8c91d7218bbc50c5e31421a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ja/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ja/thunderbird-78.12.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "95c592c41b1199bc280c219a8b4873e2bdb18171c4cccff4809a5a87ccb52d0f"; + sha256 = "5db89a1ef3e1546ac48e870c06a235e2f525a9634fed09ce706773cf2582c15b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ka/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ka/thunderbird-78.12.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "85566d54dd72a9ae9d6e3e5b85ed2ad01fe7d6e08e33b02985bc4e78e55dc5e9"; + sha256 = "524d9508d2b8ee337658d5538f9b290e08f0df9ef0c7ed0da9dc5e1e8dc2a9de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/kab/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kab/thunderbird-78.12.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "cf7f8a9975f9ce163bba8438121cd8090a498877d65d91694aac198f4307bc90"; + sha256 = "7dd3d55f7a5b68b0ebaa96efb2091c320553bbee17b0329dce2ffdb5bed0954c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/kk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/kk/thunderbird-78.12.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9ef1e12e02ed3e8a05f58da73e0221ac6545c515eb2e236b4a99b4594afc10af"; + sha256 = "f49fe966e1f22e542b62f7e2f3aa8a7377ec6997d5d0b3dc8f0e6986e0418111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ko/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ko/thunderbird-78.12.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6d028659f0b239b81dae7dfe44b96015ef1a217cddb135fee3bd8884e7b442c5"; + sha256 = "f48b05376ce85123a163ec54be9baa1325e38e1994753696a3054028a6f60ab2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/lt/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/lt/thunderbird-78.12.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "90f11349d4f5a674457f541b4edadd83b6a8f32f56eaa0a4d49e9b2c26dbbe47"; + sha256 = "124b0f6e6f1db1cac8ac33f0878d8583c29913c65fb5ca1be4653a9592967407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ms/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ms/thunderbird-78.12.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f235748f67ad749d8b020288df8c7251bcbd9d1bc4bb979554928f54270c1f88"; + sha256 = "c2917bf55feb4c9efa905920add0bea79b715dc631960e283cb413d05e1e51ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nb-NO/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nb-NO/thunderbird-78.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "de2bfc3bfc2f285a42cbcc800867395d132a56f3aaed8ff687c9e95706164ad0"; + sha256 = "1a5f059665aacea4f12f0f604979bc6de5059e50ab85710cf25d6f0478fd1acb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nl/thunderbird-78.12.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4b7be1a4717a4b42bdf3b7583b2a1fa6cc9cfcad52ac7fafa4435230dec70048"; + sha256 = "4efc6479b4948aa96e4c4a14f25ca6401058ddfea4b4175cdce851839327dd8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/nn-NO/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/nn-NO/thunderbird-78.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0ba39f2e8b6895216d97e13809749fb6a1237c5bfd0c1f8ef9e365218d1422e4"; + sha256 = "910661eecc2d65c27f63597ed5bdc96973e39603a0c702e7dd760e87b373d7c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pa-IN/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pa-IN/thunderbird-78.12.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2bf07cc1f213c20b2f181cd104eb6cdd6b5f885ccff2774817ad95840addf3ef"; + sha256 = "50aa0006b3252d7ba020a162b36f863c632fb3f6d13bf0589334ba3f34ae6ba4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pl/thunderbird-78.12.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9d2607c5d61ef121a383eb71d5bb650ba0ccb6b441666bbac5a9f3b91377f574"; + sha256 = "6f75b4492c9cf6bd3b03800a55b0e91a121e7e13ca1f451571cf25abde040487"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pt-BR/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-BR/thunderbird-78.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cab1a3fabb975895b0c57bb4cb3b90f9386d0c33228b24edc13095d7d644d727"; + sha256 = "ed8834d038affbd7fadc93dbb72d972a7dca77d9d9af4b5cbdb0cf4c36bd7b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/pt-PT/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/pt-PT/thunderbird-78.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "53b44f8caae2a2ca878435d988dbaec7c188c2fe236efcda8b92b4310aa3119f"; + sha256 = "6add8c6de555561d892b23909e5b4828230567789f71467600483c8eb0f4e6d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/rm/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/rm/thunderbird-78.12.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f170779793afc440c273b8826cc456af903a98ac9694b1aae6ee50a5bec2be26"; + sha256 = "c9ceb44aea4f61d4376d2519b233356ca48ab7eed6c62e0402c1c435baac379c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ro/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ro/thunderbird-78.12.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d0628abef66e2585db898834ddbd3ad9e97edea7269538dbd4b4520f22969b4a"; + sha256 = "5d2889df62325331b5869e17af8125179ff9371c8860ad52b4cc8d4c21253e6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/ru/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/ru/thunderbird-78.12.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "077b682cc7365aab8fb3100d5f487fc873a16a4fcf71dc25e63a2604b57ccc00"; + sha256 = "07aeda5b10bcdca5474ef156be35c38ebd15de68a3670e4e2532b045964d7164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/si/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/si/thunderbird-78.12.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7fc582c2f23b197da426ff0150941ea59fe1da26c84df41bff88039ff3fdf4fb"; + sha256 = "a70410319bcab48a407f4b379e82029528b8998ec89d7105a85ffce5e804a285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sk/thunderbird-78.12.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cde3c240b1718085b36e9479eb9717202c1a179d9cd2cd094901074d666fb763"; + sha256 = "4b110a5b7d3cab0a9145635c0e458e22eddddd97e407a229d8c8a5f5761d150d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sl/thunderbird-78.12.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "54ee18a338c727838db7cdca4c458d4b9248c626a3338ec83c41001d124d2917"; + sha256 = "d253ee57d3eac036b1b758d45609db39b47dae05e282ccaace739993ef3cfccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sq/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sq/thunderbird-78.12.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "511209ca3eb810250fef3b0b01f71941bc0436410716974244aa9b5b1193582b"; + sha256 = "700a8e7798f8b92c6874febd71b188ab0a97a2ca62930db4cb36fb12e02cefe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sr/thunderbird-78.12.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d22da1e4ab790ffb3e8a8c3928adfe8c1b7b65c08a5dbaf2bb63473b08fb5207"; + sha256 = "5485ce5280b71f9adc8ae2a544eecb8c8a12720efd604d93d5f2bf051f3edc0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/sv-SE/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/sv-SE/thunderbird-78.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c7826bfef5b705fb5d00b6ade07d092bfed25d74b6992308027e8ea99f2ed16b"; + sha256 = "a3d0f4d3d32ebb2ec9b67fcbbbabf5640b714fbcd01a742c7cabd872c5bd94f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/th/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/th/thunderbird-78.12.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "cba4789bcd072a21d5e131f0aed7aed1775f6122776f873b54fd9832bc5b621b"; + sha256 = "2d6963ec130e14f5d0721782d5a4f724eaac5bab1b4e3469e19dbbdf1512396d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/tr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/tr/thunderbird-78.12.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8f8345e6722931b495755ccf67b0546443e11d435cfe809edd00f6e3565a17bc"; + sha256 = "b6ada3486cbba66992db5a04138f03f12ac6fc004cb86558a4b8787481f39383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/uk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uk/thunderbird-78.12.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cce394a934ab0352cbd980d29a61fc1be4e66636ab5e31d358fa2efc82e17c19"; + sha256 = "c24fa7aab502cfdb88703c0abe2444cfd1bc7b94cab1f34b0626240c2a75a8cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/uz/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/uz/thunderbird-78.12.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4a94d98472bcbb34a19b58c8e4caeb2e29c58d4d7496ba0d4af02a8aa0fe3802"; + sha256 = "119d29856eb9656d89b5d06301f3abef4db106ddf3793dc0b9c0c7f2cb03428c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/vi/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/vi/thunderbird-78.12.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a48de334712d154917d6285a84ab115f48e672fdbcd9a7469013d3b07524562e"; + sha256 = "4aa063fd673684488c9565ca7f35b8b6aa2c944cec921131de8ac2dd483b5b8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/zh-CN/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-CN/thunderbird-78.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "6892a5236ac0abecaa657b98929fd9feeaa0ac9d4d64e000ced26687c4fa96a3"; + sha256 = "78fd8d25250632336c574b4d02a9c397d2a01d91660a17a3dedc98155cce84d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-x86_64/zh-TW/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-x86_64/zh-TW/thunderbird-78.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "292ae08c031cd40a493348dcf39adfecbb9372288cd2cc4bb5ada9eaee5a7649"; + sha256 = "724451f25a3e45cc23a277c4d1bf3ce76457d883d43b5a5f172340e6d8e81f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/af/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/af/thunderbird-78.12.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "26a1e66facb1839a8a2dcb2fffe3677a5d6f9c68343293625b22faf553ff1244"; + sha256 = "6ee9ef2596d099bed0962199cf95bae3f8ce322cbc2d9d78195c1caa661297d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ar/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ar/thunderbird-78.12.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6625bb6b5374ae174b21d53735c4d51d3d8464556ff42ac9b270908991837989"; + sha256 = "dfa41ea4a15f074b2530b8e8383b76617e1a916344567e30dcc370660f0ab05a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ast/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ast/thunderbird-78.12.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "57e8de5bbace8def637356ac7b519155411f8b5b2dd6496ebbdde102fea490fc"; + sha256 = "602d1ee72a11a88004236572cb2fa22fdd86cbda81a74f89342e8371a295a140"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/be/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/be/thunderbird-78.12.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c045e2b129cd373ed1b2a6ce4d12d4dd3dbcf92c380a1dd8fa237f001f7c5bda"; + sha256 = "1e7d385da89801d9a949fef16de5904314e6e012a2693a936c122e9b8276b267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/bg/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/bg/thunderbird-78.12.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "5bd9ded232f60b88be72a5cd301b02c6bc6a6651be48e08ebe5358aaa801dd6e"; + sha256 = "e8c52029a88272d3371c42cdab8d8fd97d8a816032377d22285154686a557f08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/br/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/br/thunderbird-78.12.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "1dc7583fe66a26b040e1a46281964898c5a79ead6516e02a0c1ec7a175962621"; + sha256 = "49d0c56d04033da26b9e73cce83e7de55755b269e2c15003537c2cc53d1e57c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ca/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ca/thunderbird-78.12.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "68cc1ba9382be6d5b90e94fdc6fd1403b2b07c67759be80d2623fcd41b16f51f"; + sha256 = "c31cc0421858f4a31840d6924882ed692db260e66c16b4c916d82e2eb07ec229"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cak/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cak/thunderbird-78.12.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "006d1806c7ce336fb51bcc74d4907a6aacb43c0902e0b323b638f9a9d2664ed1"; + sha256 = "5be14239cea98b350a05230efb5e15dbac7bb530f1c3f2b7f17c12b0d2ff75ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cs/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cs/thunderbird-78.12.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5b342803243a51a9e521705c1082c87cc528ac59475d6b893ca475ecb10ee02c"; + sha256 = "51260bbdeebf1cc18b7d36ad2a302841b29eee797d096ef033b5be03162177ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/cy/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/cy/thunderbird-78.12.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "55bf6bc1aa371ad52097e89dc26af4fd11a2afc73b4ece79ae3c3bf0294fe5fc"; + sha256 = "8c6e1fce7834da9a3a820bcb9df6a27f77c132f0c513ed074c24af9de8858798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/da/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/da/thunderbird-78.12.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "41d21b7065bb4a11b80990daf550a29e5d588965c83cb48a762bba7bcbbec502"; + sha256 = "fabc99558863a646565eff20badf08805e2460e541a3907fab9c6b029dadc0de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/de/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/de/thunderbird-78.12.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "190339793ab6b5bcbbea2e81a1c783fa91dc18ac702870bd045ba597d0c826d0"; + sha256 = "dc6d7c639e6e9b3ef9f4c13054ec543ed1ec6d789ae2c5e0fce5650c7fa7932b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/dsb/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/dsb/thunderbird-78.12.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "068243c6d19d9c5ba9ff4ce9793db643555657593659176fb543eba5cbde7c44"; + sha256 = "86edac99d1e2a8da228718f2fd78448948e207e3398f781ddec43d4c9ac9e425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/el/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/el/thunderbird-78.12.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ab93bb707a7bf50813b067c7d2f5f72e858073080e28094a917a4e5715612053"; + sha256 = "0113409e306300aa4bbc9dacdd85ca52e5d71ca52962ff4628a96c4103337a1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-CA/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-CA/thunderbird-78.12.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "2bbc9fe5efb8905d069174d939933b64dfeba6716f81487b4aedcea7e00fb48a"; + sha256 = "1e792a76d371479abd43bdfb993cada3b23fbb547cfadf691b25f51cacf4265e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-GB/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-GB/thunderbird-78.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6ac3648deccc9b3b01575791fadec6bb9210aeae4d32934f7ae7ddee7d857b93"; + sha256 = "596ccfcaee2a005ea2ee0a93f9644666a5e7e955e22b799bf91766908dac7db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/en-US/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/en-US/thunderbird-78.12.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e423d465824e4b56f3899fb15dbac1b016832446ded5c46b8bde0c279ddd3df2"; + sha256 = "97fcb2332b1343f9b5e06efff7ea5a73c80212512ac2b2959537d1e255a8ce44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/es-AR/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-AR/thunderbird-78.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "925c762d84e4620b96b8feb73a4b5506fe3dc339c0ef316e23ef7ea636ad8da6"; + sha256 = "0af5917c4828c08425709f0fc3aca7c74668ece53721666d6e4004b637469b17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/es-ES/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/es-ES/thunderbird-78.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d75ea97c5cfa524c93055af618cbbd27a6ef8c2125ebe963467f0e93f9f80ea3"; + sha256 = "6283c85e34f6ab7d25fdebb5ed70b1d26c601b3416cef45cc8f06a15e723d9b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/et/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/et/thunderbird-78.12.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f925832734574c0056ce60edc9630db70d262b993c913da167f01b51f9ec14b1"; + sha256 = "ab1cefeb07ead51998a7f54befb0a291c065d8a0d440a6d2c7972fa64f345948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/eu/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/eu/thunderbird-78.12.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "60f27f7d725bb90ec93ab247c708442506e9532c050bc7a66b5d23db2dcab91a"; + sha256 = "f4ce3787e3cd46c8bcadbc6ab2a728e3b76ee2556ad5e4129e4418e844a8c4e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fa/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fa/thunderbird-78.12.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "505373b341db6e20b90d555815974a232b6ec685b4301e9b81305092806d721e"; + sha256 = "35da798ea7f613489820e4e42b1c78c078c21ee7f7521ef5ba21a7602fb302ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fi/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fi/thunderbird-78.12.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6f9c715ae0d7db81db3ee72d822ea1d9395b30d0a4a2f46c50f77e4a156df27f"; + sha256 = "dd97b6c745b88a6493d280e5efc2165bc5895ec7ac56c1df63d7adcb860eec59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fr/thunderbird-78.12.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5600b094c00d9607e91f2c28aa99de75c87999a1d16739f926812a0e9bdcda53"; + sha256 = "9d49108417933e1f79a285b99cf0e49f6a009a121084148da70f4cf93a238c34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/fy-NL/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/fy-NL/thunderbird-78.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3fd24a4704df03e83bdebdf9a98a085849a72de939aa21c8fb93051ca9ddab85"; + sha256 = "efe33dbc8d7c6347359d30c63034a3553720ac806c1754752b0649d91ce293a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ga-IE/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ga-IE/thunderbird-78.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1f69cea70de04de5458a877b9ac3c2cb9cb04a60f888cdb19118bb04156540e2"; + sha256 = "c99c54902c522ec9472ed6ea4a85e6be9dd0e013a2835a38d90b4b77554c05dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/gd/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gd/thunderbird-78.12.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d33666cb1812541a81f91b457a7d9d3dba3ede5b90f0e56d31d90dd8359e077b"; + sha256 = "af46f3aa8480469783a625553688f7ef5ff00bdcd9be9c98af7d49f98e8cba7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/gl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/gl/thunderbird-78.12.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "5694106a7bccd7dacc35d89f4c2dc3080be40f937d5b3a18e6797a2dad1dfdc4"; + sha256 = "bdf94938571db3959781b490fc74aaf1a48b42663b22ae32dfab97600772be0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/he/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/he/thunderbird-78.12.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "77e2e3e1872c67de101d3fca87a3c308b26eb47f06222f0504a95e42f9248d39"; + sha256 = "1e9f6f580751bcf518813a123a0e1f2f66cee92110516867b4844bbcaa2fa67f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hr/thunderbird-78.12.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "513c4d88387c7ac3463047b4e84c2f049dcb0dcc205bcf0d1b6935f94db16a88"; + sha256 = "a6727dce9ac4074ed5685086f224cc956eacf04b3aa54fc4b7d669e2d3a548e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hsb/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hsb/thunderbird-78.12.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f2731aff055f734befefbd17778ccf8962c882266443b9ff5e6e6babcc09c0c4"; + sha256 = "16f985d7c4520bd81bc1e5a8e939a2ce97e807ab0635625d38290b073defa79d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hu/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hu/thunderbird-78.12.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c29018382b2d0d45727e23bbaf3a37661ccb7908912a24ed5ff3042766ecdec9"; + sha256 = "9e7c771cd0dfd8dd1b42721f9129d1fdd760c2d3f7bce407adec6c4f3e0fc955"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/hy-AM/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/hy-AM/thunderbird-78.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f9152a462ac758fe21c46e734bc8d8e727479f4cc8c7c26cda43bfc896244596"; + sha256 = "4a5878d9be7d0b60347a19c2533fe22ff0f02aeb5228070ecdc1bb5bd0ca5490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/id/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/id/thunderbird-78.12.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e336ee15d25b0edca6492a765af7a6b0eed3ef30155c908e4940985e373304b5"; + sha256 = "80bb061ed6efa9396627bb05ef26247e92b49fe50787e04add488cc3c69c5304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/is/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/is/thunderbird-78.12.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "6495cec1de969c1f30ef042fe604027014161497ed77eb327451eb4a70f7b1a2"; + sha256 = "4d96a6de273846f133a307967e4d96f6594c8f4fdd6c16efd39f10bd5121cf60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/it/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/it/thunderbird-78.12.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7bb395c5b3cda42c41196f06be6ed2f35eff958c3a9325807c42616b971087c3"; + sha256 = "f10c633cd2ab40a4845fe7c681094bbe18b2d0240c10d77ab2e47c633e10baaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ja/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ja/thunderbird-78.12.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec313b0754cffa5ed388e983faa394b146cb5227c99e74ee681ab833540b1cf4"; + sha256 = "b97a41e3e48c29f60aa22e9ce98bb4bab641ba633877d3086e92d1904bc7e34a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ka/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ka/thunderbird-78.12.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "13b8d137d2b1da647ed603208a4cd275e5cc11d3395a5709629ed8965c5c355d"; + sha256 = "c2a0bdf08c8ae9f5ca5df56eef07331834d52d4d8fefbe87e3f5f7bd31f83457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/kab/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kab/thunderbird-78.12.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a8780a5af7cd112d05a2b13469ff40d09c1909b2a09012a4ac7883b8555c3b71"; + sha256 = "4475c84a76bf254c6126384c15bb9721750cb935b2ab49b4825bc1d2c9552cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/kk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/kk/thunderbird-78.12.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1a1b0ac46b10eda11ffa4a53dcf53c1dce2a2a52355e08e44960d135a8feea91"; + sha256 = "5e74e269de716b9239dd45254d660679f8cacba3264aab7565be68c16143bf40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ko/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ko/thunderbird-78.12.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "312c211b3079191b5d53cf5052e0225fee2b4e699a848b3d29a8efdf3192185b"; + sha256 = "b40047124044f3ba15f08526c1898f12d88e186f422202ce3aab1ee0f23cd0c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/lt/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/lt/thunderbird-78.12.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "817b079ecff259043a0bf3abece031c15e04a2a615b49314d8377da6ee8feebc"; + sha256 = "f7bb95f825b8aa20f40851fd0e99ac1574e26f2a5c69dd7bfdc2f865a11051b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ms/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ms/thunderbird-78.12.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "737b88b2fd394851143a798508b537b921fde8c0648856e09426102e7962ef7d"; + sha256 = "473ea13ae580d09237a04e08331d883eff6c419d61f0ba1afaa1c5a948da98b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nb-NO/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nb-NO/thunderbird-78.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9754dd9cc6ca38970a50b3f26d0d2fe1cb1c3a66a77829489cf6f2098f7f244f"; + sha256 = "efe8ac1e38a085caec95b817548c5cc06f45aac03bee5545cb65b93eb19efbf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nl/thunderbird-78.12.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b43da367f973e7b2899967c777514262f4503778d550bee27c5b11651555cc17"; + sha256 = "a646a84098185d299118305c651788bef0a88f805b08ff51bcc87067a5460c06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/nn-NO/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/nn-NO/thunderbird-78.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "cb0bae6a905c2ffc39f173519ab9dcdd7835c1b9c169f778727b55eeb8c67cfa"; + sha256 = "14b765aa23671318b6356886f3bee0847570158c4215e0d106bc823df045414b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pa-IN/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pa-IN/thunderbird-78.12.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d9d7c15ca519636ff93e0f1ec956e131b5bc92bb18a67c7958140ebd75ca84c0"; + sha256 = "ddc9dae4e4f7a9cd99d8e2e5041ac52432b6835f7b6e0867bc7ea2ff7283ba95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pl/thunderbird-78.12.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7cbe410b721565b676d6a9c0d09e163a7452b0a9137672f654f8fdeca6212a27"; + sha256 = "396373ad618f35be40c79f1e67ba67f1e72dbb2ee250459f610cc1ad2b7bd2c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pt-BR/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-BR/thunderbird-78.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "aa4fbe2a656d937559c8556549f0cc2d9f8fa0c75ad1ede55c9e8877a63538cd"; + sha256 = "0e62406a68fc33d7c77b10c2ae427c508ee491e33041be114b03c4eb630e8003"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/pt-PT/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/pt-PT/thunderbird-78.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "63a2c44c1ec1486574c8addf920e8561f792d01fb8179239fb268e5277e68782"; + sha256 = "ba8e89a5a15fe69660758a83e3801800d1a15ab051d8ee581dd1b97b6a67ddd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/rm/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/rm/thunderbird-78.12.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8610c130d68a8d5f38ea179b13bdd17ab349cca8647470b4e2987937676f3c5e"; + sha256 = "ac9705e6c64093d375db018116f66792eadef36fa32919bc467a0d08ed20fadc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ro/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ro/thunderbird-78.12.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d809cc26b134f707579e78e624f654b569d33d2282391943eeabfd494388f4f9"; + sha256 = "4fdcb748d23044effd6fe4e94c525381e2dce3941c1829625c84eab795dc4797"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/ru/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/ru/thunderbird-78.12.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1d73258212131087d878fac0087f758cd11209aeeaff075b0352f8414769d3d7"; + sha256 = "63f0d9be0baa91b3a65189ce9bee01d5984e04eba319484c69560cd10af750e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/si/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/si/thunderbird-78.12.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "342ddb753fc1870321613e7668a741269bfff786f21ff22f4f8f84f5e1df9c2a"; + sha256 = "db371618474a3812c641d9518f04035c353c9e184b91f713d9b70f09b693f6d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sk/thunderbird-78.12.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "241cae2dbe7130a3df8d64e99fce375c0966df0cf4dbd6cbddfb069f736c3450"; + sha256 = "6b5370c99076c0955e3b3fb58be9649656fd12a32126a4bf2d54d51e9147c7c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sl/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sl/thunderbird-78.12.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d09d44f1fd9e90e71e67334eed2df3eacdbc2509782e625e25aea3b993b1f28a"; + sha256 = "5c5ef16ae617f18f4ad4774bda932d8858c35d6ef6e61a5bd1c730564193bedb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sq/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sq/thunderbird-78.12.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "afa21cf461d53c2a3e781e45b7802a0b5ffcb0ca4c4452865bdbf2bceeb13776"; + sha256 = "e8462127bcfdfec2b651b11d569918e7ffff37c7ab0b556c10434273e59b43d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sr/thunderbird-78.12.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15b3faf5cef87e1101629410cdb169f81da94b5e1b0902d02b161ef67df15e8f"; + sha256 = "9fe5e0091ebb9d3b0d07a6cc6dcb167b7608b0acc7ef5a5e24604e8d007001f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/sv-SE/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/sv-SE/thunderbird-78.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b42f3e8aefc4ebfc718ace6eda4d9416752dbec346f1a212fa637edfe08277dc"; + sha256 = "1b6d4b29e53b933418ba25b8284d62d218076b1dde09006e0508a060190b81ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/th/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/th/thunderbird-78.12.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0972ee48e0f8f0e6f81831a5c8b3d832c7af05477a3f824afb252c1f32d6843a"; + sha256 = "68a90653d02c8b9f022b52693884f5bce8d60bb89c5099784347dd9c9e578c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/tr/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/tr/thunderbird-78.12.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5dccdb0c97511aab0926caf679dced22609fb0e702b87078ac9379c94b3aed37"; + sha256 = "9776f2eceb7bfc15292d621d874a7fa3f092223752b81b65623a3294044022d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/uk/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uk/thunderbird-78.12.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "526e1cdadbf15a0aee1b31607f39710f90fdd6ea23623c74fbc87928b0b2056c"; + sha256 = "9c3dde23f775176780ff24d89d46659b293b22cee45df9a2dcf1bf3f8257c19c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/uz/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/uz/thunderbird-78.12.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "46454f21518cdeee20dcd0ed3f57a45cf8ab3a240d55cf2df36aed253307fb99"; + sha256 = "b2d9d4b3e43fe3af5c602c4b429d4fb29461ace04498cf14b0f75fba7ea0c667"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/vi/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/vi/thunderbird-78.12.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d624ec4f25277ae1b4b463e0c8381371562cf4185aab3ed67b9463b3dadde5dd"; + sha256 = "c2c7a721d82ad59022020cad3dd152271a83207fbd0f61b91d3c464aed16bcaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/zh-CN/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-CN/thunderbird-78.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3699eefc2f941a4b32305a934a02bb94b5213c4584bfeb816859de471e2d2f08"; + sha256 = "9e26860c8d78d13fffcc9eb418fb4d34a7da07b5604f8d01eddc10471e57dd70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.11.0/linux-i686/zh-TW/thunderbird-78.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.12.0/linux-i686/zh-TW/thunderbird-78.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9d6878ab69fcf266f1b226100a5b26d78d8d604f741827ae8f62fca665adf557"; + sha256 = "403ab2f3262ce3e79d2261ca2afd8ddca98c116086dda620bbe54c45d2111632"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 00c6b5cbf27..7b74cdc0208 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -50,6 +50,7 @@ , unzip , which , writeScript +, xdg-utils , xidel , xorg , yasm @@ -73,13 +74,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.11.0"; + version = "78.12.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1m12kx830pfzvby8j9i5nb9c5v71vlg4wr0qrjgg3pw5ml9j5x7myrqyfd49l2qppm3xjn08srvmf45avnwq0lrys4sb83iwsd46sf6"; + "8a9275f6a454b16215e9440d8b68926e56221dbb416f77ea0cd0a42853bdd26f35514e792564879c387271bd43d8ee966577f133f8ae7781f43e8bec9ab78696"; }; nativeBuildInputs = [ @@ -311,6 +312,7 @@ stdenv.mkDerivation rec { --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 --prefix PATH : "${lib.getBin gnupg}/bin" + --prefix PATH : "${lib.getBin xdg-utils}/bin" --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ) ''; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 33030e0c7ee..2fa486b83a9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.3"; + version = "2021.4"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-f7ZCDZ/RN+Z0Szmnx8mbzhKZiRPjqXTsgClfWViFYzo="; + sha256 = "sha256-JnHG4qD6nH2l7RCYHmb7Uszn0mrMsFtMHQ3cKpXcq00="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 1256f47041a..3fadac3f291 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -89,6 +89,17 @@ let x86suffix = "38"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; + + "21.06.0" = { + major = "21"; + minor = "6"; + patch = "0"; + x64hash = "f3f98c60b0aaac31eb44dc98f22ee7ae7df229c960d5d29785eb5e9554f85f68"; + x86hash = "c2d9652ad9488a9ff171e62df8455ebe6890bcfade1cc289893ee35322d9d812"; + x64suffix = "28"; + x86suffix = "28"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + }; }; # Retain attribute-names for abandoned versions of Citrix workspace to diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index e7544258acf..aab30c24e20 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.74"; + version = "0.75"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - sha256 = "0zc43g8ycyf712cdrja4k8ih5s3agw1k0nq0jkifdn8xwn4d7mfx"; + sha256 = "1xgrr1fbirw79zafspg2b6crzfmlfw910y79md4r7gnxgq1kn5yk"; }; # glib-2.62 deprecations diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index e2f1cf2c8a2..f61a00f89ad 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.13"; + version = "1.4.20"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-R+RfczAnt5R0YmXt5SmH8gOuWOH0LZ/70pOMDAXJgsE="; + sha256 = "sha256-m3DUaoOD8COxMwCVBTipzCAz3mqIdunEbVPjyjAl9So="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/networking/rofi-vpn/default.nix b/pkgs/applications/networking/rofi-vpn/default.nix new file mode 100644 index 00000000000..8ff83db294f --- /dev/null +++ b/pkgs/applications/networking/rofi-vpn/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitLab +, makeWrapper +, networkmanager +, rofi-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "rofi-vpn"; + version = "0.2.0"; + + src = fetchFromGitLab { + owner = "DamienCassou"; + repo = pname; + rev = "v${version}"; + sha256 = "04jcfb2jy8yyrk4mg68krwh3zb5qcyj1aq1bwk96fhybrq9k2hhp"; + }; + + installPhase = '' + runHook preInstall + + install -D --target-directory=$out/bin/ ./rofi-vpn + + wrapProgram $out/bin/rofi-vpn \ + --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped networkmanager ]} + + runHook postInstall + ''; + + nativeBuildInputs = [ makeWrapper ]; + + meta = with lib; { + description = "Rofi-based interface to enable VPN connections with NetworkManager"; + homepage = "https://gitlab.com/DamienCassou/rofi-vpn"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DamienCassou ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 4fe5272bc07..d9bc78bb2fe 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.6"; + version = "3.4.7"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0a26kcj3n1a2kw1f3fc6s1x3rw3f3bj2cq6rp7k0kc4ciwh7i9hj"; + sha256 = "17d00kl0s010wg2dfhy7sdbr2qm54lsi317fmbcvjz4rxx8ywk3c"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index b1c9adfd9c1..fec77560393 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.1.0"; + version = "7.16.0"; src = fetchurl { + # find the latest version by + # curl https://deb.termius.com/dists/squeeze/main/binary-amd64/Packages url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; - sha256 = "801579b931ca0ad5340085df8863042336e2b609dd1cd6771260c873f3d2bb73"; + sha256 = "013nli61bk4x4hkhr6gcpzm1y8ycmqk3vr7q0w2dn2bfdwjg559v"; }; desktopItem = makeDesktopItem { @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" cp -R "opt" "$out" cp -R "usr/share" "$out/share" @@ -48,6 +52,8 @@ stdenv.mkDerivation rec { # Desktop file mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications" + + runHook postInstall ''; runtimeDependencies = [ (lib.getLib udev) ]; @@ -58,7 +64,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = true; description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index e32502749dc..0554713feb8 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # default and this patch can be removed. # https://github.com/NixOS/nixpkgs/issues/38506 (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d3ff951d3c7249927e7113b3de1653031db24596/abiword/trunk/enchant-2.1.patch"; sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2"; }) ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 71717c010dd..4f3fde81e98 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.5.2"; + version = "21.7.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "cf68dc78e641ca66403621cef4002ddd09463ead2eb060812d8124d6749ba03b"; + sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index e6d3186578a..4b97f7b3dcd 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -36,9 +36,9 @@ appimageTools.wrapType2 { git glib glibc - gnome.gdk_pixbuf - gnome.gtk - gnome.gtk.dev + gdk-pixbuf + gtk3 + gtk3.dev gnome.zenity gnome2.GConf gnumake @@ -48,7 +48,7 @@ appimageTools.wrapType2 { gtk3.dev gtk3-x11 gtk3-x11.dev - kdialog + plasma5Packages.kdialog libappindicator-gtk2.out libexif (libjpeg.override { enableJpeg8 = true; }).out @@ -70,12 +70,12 @@ appimageTools.wrapType2 { sqlite.dev udev unzip - utillinux + util-linux watch wget which wrapGAppsHook - xdg_utils + xdg-utils xorg.libX11 xorg.libXau xorg.libXaw diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index b212ae05a9d..74e06d4311c 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -2,8 +2,23 @@ with pythonPackages; -buildPythonApplication rec { +let + # Watson is currently not compatible with Click 8. See the following + # upstream issues / MRs: + # + # https://github.com/TailorDev/Watson/issues/430 + # https://github.com/TailorDev/Watson/pull/432 + # + # Workaround the issue by providing click 7 explicitly. + click7 = pythonPackages.callPackage ../../../development/python-modules/click/7.nix {}; + click7-didyoumean = click-didyoumean.override { + click = click7; + }; +in buildPythonApplication rec { pname = "watson"; + + # When you update Watson, please check whether the Click 7 + # workaround above can go away. version = "2.0.1"; src = fetchFromGitHub { @@ -19,7 +34,7 @@ buildPythonApplication rec { ''; checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; - propagatedBuildInputs = [ arrow click click-didyoumean requests ]; + propagatedBuildInputs = [ arrow click7 click7-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with lib; { diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 82331a9496d..8c0cb2be32b 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "giflib6.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/giflib6.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/ce6f25eb369dc011161613894f01fd0a6ae85a09/trunk/giflib6.patch"; sha256 = "173l0xkqq0v2bpaff7hhwc7y2aw5cclqw8988k1nalhyfbrjb8bl"; }) (fetchpatch { name = "xplanet-c++11.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/xplanet-c++11.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/ce6f25eb369dc011161613894f01fd0a6ae85a09/trunk/xplanet-c++11.patch"; sha256 = "0vldai78ixw49bxch774pps6pq4sp0p33qvkvxywcz7p8kzpg8q2"; }) ]; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 74ed1873efe..1927950c4fc 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps +{ lib, stdenv, fetchFromGitLab, gfortran, perl, procps , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook , python3 }: @@ -7,19 +7,24 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "10.3"; + version = "10.5"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "1axr3j53mi30gm3f645ga5jkhxbc7rbx432w2k2lgg6g9dv3fcs4"; + sha256 = "1bgdkmsp6pwq3b6nxxkimrdmz71wqr8qi25gdzwpcv9wmcf1q27v"; }; - nativeBuildInputs = [ perl procps autoreconfHook ]; + nativeBuildInputs = [ + perl + procps + autoreconfHook + gfortran + ]; + buildInputs = [ libyaml - gfortran libxc blas lapack diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index dac6713a495..96a2c9a0489 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -2,11 +2,11 @@ let pname = "diylc"; - version = "4.17.0"; + version = "4.18.0"; files = { app = fetchurl { url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; - sha256 = "0cysqkrddhbs7rprm8xm21c286mz4apw66fxakhzlg50kjn0nwjv"; + sha256 = "09fpp3dn086clgnjz5yj4fh5bnjvj6mvxkx9n3zamcwszjmxr40d"; }; icon16 = fetchurl { url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -d $out/share/diylc - ${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc + mkdir -p $out/share/diylc + unzip -UU ${files.app} -d $out/share/diylc rm $out/share/diylc/diylc.exe rm $out/share/diylc/run.sh @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png - install -d $out/share/applications + mkdir -p $out/share/applications ln -s ${launcher}/share/applications/* $out/share/applications/ - install -d $out/bin + mkdir -p $out/bin cat <<EOF > $out/bin/diylc #!${bash}/bin/sh cd $out/share/diylc diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 9848eb58399..596083c2709 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -62,6 +62,7 @@ assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads))) "Only kicad-unstable(-small) supports address/thread sanitation"; assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; + let inherit (lib) optional optionals; in @@ -81,14 +82,16 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = optionals (withScripting) [ + cmakeFlags = optionals (stable && withScripting) [ "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_PYTHON3=ON" "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" ] - ++ optional (!withScripting) + ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING=OFF" + "-DKICAD_SCRIPTING_WXPYTHON=OFF" + ] ++ optional (withNgspice) "-DKICAD_SPICE=ON" ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" @@ -152,7 +155,10 @@ stdenv.mkDerivation rec { openssl boost ] - ++ optionals (withScripting) [ swig python wxPython ] + # unstable requires swig and python + # wxPython still optional + ++ optionals (withScripting || (!stable)) [ swig python ] + ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCE) opencascade ++ optional (withOCC) opencascade-occt diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index c30c074a5de..ae403d3f733 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,23 +27,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-05-16"; + version = "2021-07-12"; src = { - rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; - sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; + rev = "76a6177eb7fc2efe8b5fd522355e70c44a33b150"; + sha256 = "1a94z29if73cnxjx75vkgasm339dasbrjwbg2zk1c35pfygnwrj5"; }; }; libVersion = { - version = "2021-05-16"; + version = "2021-07-12"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "32de73ea01347a005790119eb4102c550815685c"; - symbols.sha256 = "0gj10v06rkxlxngc40d1sfmlcagy5p7jfxid0lch4w0wxfjmks7z"; + symbols.rev = "a6f64c12c9cdea4cda25cdd2c92708e7eb461d46"; + symbols.sha256 = "0j6ng3ysqlxcggjyq3bsgqzg6j50if74q2dpyrdh5pckfqvvmv20"; templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; - footprints.rev = "8fa36dfa3423d8777472e3475c1c2b0b2069624f"; - footprints.sha256 = "138xfkr0prxw2djkwc1m4mlp9km99v12sivbqhm1jkq5yxngdbin"; + footprints.rev = "1bacc7562198e2a2985df7f2fbcd7620b4fd0d46"; + footprints.sha256 = "1h17q0xpl4k4klg3mafzsbl88wzrg73xjsh8llyni2jzs531545a"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 2b099e7664a..611bbbe979f 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -52,5 +52,10 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ marsam mpickering ]; platforms = platforms.unix; + + # Broken due to Agda update. See + # https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881107449. + broken = true; + hydraPlatforms = platforms.none; }; } diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index c7c5c9c6fa7..be1d6f253bc 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gappa-1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz"; - sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA="; + url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz"; + sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb"; }; buildInputs = [ gmp mpfr boost.dev ]; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index dda18c49b72..6196f644370 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -3,27 +3,26 @@ stdenv.mkDerivation rec { pname = "leo3"; version = "1.2"; - jar = fetchurl { + src = fetchurl { url = "https://github.com/leoprover/Leo-III/releases/download/v${version}/leo3.jar"; sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; }; - phases=["installPhase" "fixupPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{bin,lib/java/leo3} - cp "${jar}" "$out/lib/java/leo3/leo3.jar" + cp "${src}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; - meta = { - inherit version; + meta = with lib; { description = "An automated theorem prover for classical higher-order logic with choice"; - license = lib.licenses.bsd3; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.bsd3; + maintainers = [maintainers.raskin]; + platforms = platforms.linux; homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; }; } diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 2d625a1c1b2..e426f7b8098 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6"; }; + dontConfigure = true; dontStrip = true; - phases = "unpackPhase installPhase"; installPhase = '' mkdir -p $out/bin cp -R bin $out/libexec diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 7fb73419c07..63a94636560 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; installPhase = '' mkdir -p $out/share @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.mit; maintainers = with lib.maintainers; [ timor ]; - inherit version; }; } diff --git a/pkgs/applications/science/math/engauge-digitizer/default.nix b/pkgs/applications/science/math/engauge-digitizer/default.nix index 5b529ca4b30..4c26dc2887c 100644 --- a/pkgs/applications/science/math/engauge-digitizer/default.nix +++ b/pkgs/applications/science/math/engauge-digitizer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "engauge-digitizer"; - version = "12.1"; + version = "12.2.2"; src = fetchFromGitHub { owner = "markummitchell"; repo = pname; rev = "v${version}"; - sha256 = "12gflxqaa4w6vifwpaqwl0l3f9qq5pbrh45s1rpc584nmr0897a7"; + sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY="; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 39d9c866cae..5ea3550d08a 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,15 +1,19 @@ { lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }: stdenv.mkDerivation rec { - name = "getdp-${version}"; + pname = "getdp"; version = "3.3.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf"; }; - nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ blas lapack mpi petsc python3 ]; + inherit (petsc) mpiSupport; + nativeBuildInputs = [ cmake python3 ]; + buildInputs = [ gfortran blas lapack petsc ] + ++ lib.optional mpiSupport mpi + ; + cmakeFlags = lib.optional mpiSupport "-DENABLE_MPI=1"; meta = with lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index d9f6a0c74e8..7de63c287ea 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,10 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.3.0"; + version = "12.3.1"; lang = "en"; language = "English"; - sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; + sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509"; } { version = "11.3.0"; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 54e26cd2ee8..138c97d73be 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , flint @@ -11,57 +10,16 @@ }: stdenv.mkDerivation rec { - version = "0.7.27"; + version = "0.7.29"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "sha256-1HHCIeaNE2UsJNX92UlDGLJS8I4nC/8FnwX7Y4F9HpU="; + sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; }; - patches = [ - # the five patches below are included with sage 9.3. since pynac - # is a self-described "Sage Math support library", we include them - # here. - - # https://trac.sagemath.org/ticket/30688 - (fetchpatch { - name = "power_inf_loop.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3"; - sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs="; - }) - - # https://trac.sagemath.org/ticket/31479 - (fetchpatch { - name = "disable_poly_mul_expand.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/disable_poly_mul_expand.patch?h=9.3"; - sha256 = "sha256-gRjoltU9Tzj7fjNyE25fY+iyDxERzSTOMigzxFpUqPo="; - }) - - # https://trac.sagemath.org/ticket/31530 - (fetchpatch { - name = "too_much_sub.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3"; - sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis="; - }) - - # https://trac.sagemath.org/ticket/31554 - (fetchpatch { - name = "handle_factor.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3"; - sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; - }) - - # https://trac.sagemath.org/ticket/31645 - (fetchpatch { - name = "seriesbug.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/seriesbug.patch?h=9.3"; - sha256 = "sha256-b3//oirN7JHDYqrvE+tDYcnKpSYQJ08yBzcNlII2Dts="; - }) - ]; - buildInputs = [ flint gmp @@ -84,7 +42,7 @@ stdenv.mkDerivation rec { of the full GiNaC, and it is *only* meant to be used as a Python library. ''; homepage = "http://pynac.org"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 75607fdda34..0da3014507a 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,6 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash -, Cocoa, OpenGL, noSplash ? false }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, pcre +, pkg-config +, python2 +, libX11 +, libXpm +, libXft +, libXext +, libGLU +, libGL +, zlib +, libxml2 +, lz4 +, xz +, gsl_1 +, xxHash +, Cocoa +, OpenGL +, noSplash ? false +}: stdenv.mkDerivation rec { pname = "root"; @@ -15,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] - ; + ; patches = [ ./sw_vers_root5.patch diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a97be6ec76f..8aa9006d523 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,23 +1,73 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json -, pkg-config, python, xxHash, zlib, zstd -, libAfterImage, giflib, libjpeg, libtiff, libpng -, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }: +{ stdenv +, lib +, fetchurl +, makeWrapper +, cmake +, git +, ftgl +, gl2ps +, glew +, gsl +, libX11 +, libXpm +, libXft +, libXext +, libGLU +, libGL +, libxml2 +, lz4 +, xz +, pcre +, nlohmann_json +, pkg-config +, python +, xxHash +, zlib +, zstd +, libAfterImage +, giflib +, libjpeg +, libtiff +, libpng +, Cocoa +, CoreSymbolication +, OpenGL +, noSplash ? false +}: stdenv.mkDerivation rec { pname = "root"; - version = "6.24.00"; + version = "6.24.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; + sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] - ; + buildInputs = [ + ftgl + gl2ps + glew + pcre + zlib + zstd + libxml2 + lz4 + xz + gsl + xxHash + libAfterImage + giflib + libjpeg + libtiff + libpng + nlohmann_json + python.pkgs.numpy + ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] + ; patches = [ ./sw_vers.patch diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 8919f85e44d..5ecde839606 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.5.0"; + version = "6.5.3"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "b166ec74537e02553fcaf0ddcffc32dfdb9dcaa1260af297a56eded6a179b2ee"; + sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 1225f036a49..7a3210459d1 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ppprhfw06779hz1b10qvq62gsw73shccsav982dyi6xmqb6jqji"; }; - phases = [ "installPhase" ]; + dontUnpack = true; buildInputs = [ perlPackages.grepmail mutt ]; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 0fc85cea05c..e950fcfb1cd 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib -, future, psutil, setuptools +, defusedxml, future, psutil, setuptools # Optional dependencies: , bottle, pysnmp , hddtemp @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.0"; + version = "3.2.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "126xpx8i85giy3hkhqh0qcln9i1qj5bfciaqh9486rkl54xm8zsr"; + sha256 = "0m2cxmlyay2rr9hnc08s5q9xwdqy0nhzsl10by4f9ji0kiahnpl6"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -37,6 +37,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ bottle + defusedxml future netifaces psutil 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 72a27cf0601..46d19f2814d 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.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-ztRwUf73ioygkgmE9t/EKJPerJJscJYG4YNeNdzXH1g="; + sha256 = "sha256-lwdsl3dzqrIL1JoBFmldwsCvNCWUcTlgeoEoCvmlTCQ="; }; - cargoSha256 = "sha256-cCMHMGHfI0JyIL8+q2fyzamBGGHZx3mc2FpwTUa4S9Y="; + cargoSha256 = "sha256-7TvxkSJ3iWJnjD3Xe7WDXBNWIyl8U9XTCn9muUG1AmI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 707e0855d15..f0ff57b2cb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.9"; + version = "3.10.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "11186pdgaw5p4iv10dqcnynf5pws2v9nhqqqca7z5b7m20fpfjl7"; + sha256 = "120hds7v29v70qxz20ppxf2glmgbah16v7jyy9i6hb6cfqp68vr8"; }; buildInputs = [ git gettext ]; @@ -20,10 +20,8 @@ in buildPythonApplication rec { doCheck = false; - postFixup = '' - wrapQtApp $out/bin/git-cola - wrapQtApp $out/bin/git-dag - + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index add7bfc5526..15d0fe9bc0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git -}: +{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: stdenv.mkDerivation rec { pname = "git-sync"; - version = "20151024"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; - sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; + sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,10 +17,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a git-sync $out/bin/git-sync + cp -a git-* $out/bin/ ''; wrapperPath = with lib; makeBinPath [ + inotify-tools coreutils git gnugrep diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index c7884c2b52e..ec4db1631b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.1"; - sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY="; + version = "1.2.2"; + sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; in stdenv.mkDerivation { pname = "git-vendor"; 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 075524340bf..775c4dd09cd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -337,8 +337,11 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; - passthru.tests = { - buildbot-integration = nixosTests.buildbot; + passthru = { + shellPath = "/bin/git-shell"; + tests = { + buildbot-integration = nixosTests.buildbot; + }; }; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 3049012160d..4fc1bce4474 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8RPIPimDImLUR9oHVZZ7ZeKLtIhebv/d0kl4CQ5NFdU="; + sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo="; }; - cargoSha256 = "sha256-1IHbOjZV8Rc0el7J983B8pvnbt8+QtYiknZU/I85OnY="; + cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 258e81acedf..bd61d984c62 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.4"; + version = "1.14.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo="; + sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c0cc9d5e2b1..3e10add49d4 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.6.1"; + version = "7.7.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw="; + sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bdc83b8e30b..b214b663ae6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.0.2", - "repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286", + "version": "14.0.5", + "repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.0.2-ee", + "rev": "v14.0.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.0.2", + "GITALY_SERVER_VERSION": "14.0.5", "GITLAB_PAGES_VERSION": "1.40.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.0.2" + "GITLAB_WORKHORSE_VERSION": "14.0.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5aff7a34365..ced652e68d9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "14.0.2"; + version = "14.0.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY="; + sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM="; }; vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 94c14a739d3..e237c4fd480 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.0.2"; + version = "14.0.5"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 55839138c3a..62222b56396 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1667,4 +1667,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index d7aa8c8f068..4c4cedd5a12 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.50"; + version = "1.0.0-alpha.52"; src = fetchCrate { inherit version pname; - sha256 = "1hinnpbk83470sdif11v1wy1269jm7cpl0ycj2m89cxwk5g54cxg"; + sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; }; - cargoSha256 = "0bc116nyykq8ddy7lnhxibx6hphn344d0fs7fbl2paax9ahbh2g0"; + cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ gal_bolle dywedir ]; + maintainers = with maintainers; [ gal_bolle dywedir fabianhjr ]; }; } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ee7c4d6bcfa..ec358507c2d 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,7 +8,7 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? false + , tiniRev, tiniSha256, buildxSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc @@ -77,6 +77,10 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + postPatch = '' + patchShebangs hack/make.sh hack/make/ + ''; + buildPhase = '' export GOCACHE="$TMPDIR/go-cache" # build engine @@ -88,11 +92,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - ''; - installPhase = '' cd ./go/src/${goPackagePath} install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd @@ -144,6 +143,14 @@ rec { sqlite lvm2 btrfs-progs systemd libseccomp ] ++ optionals (buildxSupport) [ docker-buildx ]; + postPatch = '' + patchShebangs man scripts/build/ + substituteInPlace ./scripts/build/.variables --replace "set -eu" "" + '' + optionalString buildxSupport '' + substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ + ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + ''; + # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables buildPhase = '' export GOCACHE="$TMPDIR/go-cache" @@ -162,14 +169,6 @@ rec { cd - ''; - postPatch = '' - patchShebangs . - substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' - substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} - ''; - outputs = ["out" "man"]; installPhase = '' @@ -211,7 +210,7 @@ rec { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; + maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ]; platforms = with platforms; linux ++ darwin; }; @@ -222,14 +221,14 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.6"; + version = "20.10.7"; rev = "v${version}"; - sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl"; + sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3"; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk"; + sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw"; }; runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95 runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb"; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e7479957444..74d87a1b740 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch, - fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, - libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, - withX ? true }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook +, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst +, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which +, libdrm, udev +, withX ? true +}: stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.2.5"; + version = "11.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-Jv+NSKw/+l+b4lfVGgCZFlcTScO/WAO/d7DtI0FAEV4="; + sha256 = "1yfffxc7drr1hyg28jcvly7jn1bm4ca76lmma5ykbmba2qqszx49"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -20,32 +22,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] + buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # Fix building with glib 2.68. Remove after next release. - # We drop AUTHORS due to conflicts when applying. - # https://github.com/vmware/open-vm-tools/pull/505 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch"; - stripLen = 1; - excludes = [ "AUTHORS" ]; - sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg"; - }) - ]; - postPatch = '' - # Build bugfix for 10.1.0, stolen from Arch PKGBUILD - mkdir -p common-agent/etc/config - sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am - sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c @@ -54,24 +39,28 @@ stdenv.mkDerivation rec { sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c ''; - configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] - ++ lib.optional (!withX) "--without-x"; + configureFlags = [ + "--without-kernel-modules" + "--without-xmlsecurity" + "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = builtins.toString [ - # igrone glib-2.62 deprecations - # Drop in next stable release. - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - # fix build with gcc9 "-Wno-error=address-of-packed-member" "-Wno-error=format-overflow" ]; + preConfigure = '' + mkdir -p ${placeholder "out"}/lib/udev/rules.d + ''; + postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" + substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh" ''; meta = with lib; { @@ -82,7 +71,7 @@ stdenv.mkDerivation rec { better management of, and seamless user interactions with, guests. ''; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ joamaki ]; }; } diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5ab696ed1d5..227439713ed 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -64,11 +64,9 @@ buildGoModule rec { installShellCompletion --fish completions/fish/* installShellCompletion --zsh completions/zsh/* MANDIR=$man/share/man make install.man-nobuild - '' + lib.optionalString stdenv.isLinux '' install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system - '' + '' runHook postInstall ''; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593df..820e8ad18bc 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -13,12 +14,14 @@ , cni-plugins # not added to path , iptables , iproute2 +, qemu +, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ + binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -27,6 +30,9 @@ let util-linux iptables iproute2 + ] ++ lib.optionals stdenv.isDarwin [ + qemu + xz ] ++ extraPackages); in runCommand podman.name { diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 8f7a88a2182..2e024c20f41 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-slNVSlyJLaqIFF4uJP/7u4M0AkJLQjqkHO5TeKFYgSA="; + sha256 = "sha256-xd46HlZenTNCzmnCGN3x7Ah8pPLwbG9LSMGmiPIPyv0="; }; vendorSha256 = null; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index fbb4a7a5e49..ec7d3ae5004 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config -, libjpeg, libtiff, libpng, freetype +, libtiff , fltk, gtk -, libX11, libXext, libICE +, libICE, libSM , dbus , fetchpatch }: @@ -24,8 +24,16 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Causes fatal ldconfig cache generation attempt on non-NixOS Linux + for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do + substituteInPlace $mkfile \ + --replace 'test -w /etc' 'false' + done + ''; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; + buildInputs = [ libtiff fltk gtk libICE libSM dbus ]; # A strange type of bug: dbus is not immediately found by pkg-config preConfigure = '' diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ca1a98dcdc3..e8330ee2936 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }: +{ lib, fetchFromGitHub, rustPlatform, libX11, libXinerama }: let - rpath = lib.makeLibraryPath [ libXinerama libX11 ]; + rpathLibs = [ libXinerama libX11 ]; in rustPlatform.buildRustPackage rec { @@ -17,15 +17,16 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE="; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libX11 libXinerama ]; + buildInputs = rpathLibs; postInstall = '' - wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}" - wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" + for p in $out/bin/leftwm*; do + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $p + done ''; + dontPatchELF = true; + meta = with lib; { description = "A tiling window manager for the adventurer"; homepage = "https://github.com/leftwm/leftwm"; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 5e3392b2002..093b6d1884c 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 # This patch adds python3 support (fetchurl { - url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/90cb57ef53d952bb6ab4c33a184f815bbe1791c0/openbox/trunk/py3.patch"; sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; }) ]; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index dc1080d97b2..9fa0959ed50 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -37,14 +37,14 @@ let }; in stdenv.mkDerivation rec { pname = "phosh"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "104qib4blh32s7bg6j3xza3s9syrxrvyh2wpyh5yx7v5wqarr20x"; + sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs"; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 41a0670d0c8..965b8d8189a 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo, writeText }: +{ lib, stdenv, emacs, texinfo, writeText, gcc }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 1456d9e423d..ef154982ad0 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, writeText, ... }: +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: with lib; @@ -72,6 +72,8 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + nativeBuildInputs = [ gcc ]; + addEmacsNativeLoadPath = true; postInstall = '' diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 824611b20c8..408448f26a0 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ ename = if ename == null @@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ packageBuild = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "0a22c3fbbf661822ec1791739953b937a12fa623"; - sha256 = "0dpy5p34il600sc8ic5jdgb3glya9si3lrvhxab0swks8fdydjgs"; + rev = "047801d301a73d4932f33f768d94a8ed26b8d524"; + sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59"; }; elpa2nix = ./elpa2nix.el; @@ -70,7 +70,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ -L "$NIX_BUILD_TOP/package-build" \ -l "$melpa2nix" \ -f melpa2nix-build-package \ - $ename $version + $ename $version $commit runHook postBuild ''; diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el index 99c755e2afc..bd2aadd5aeb 100644 --- a/pkgs/build-support/emacs/melpa2nix.el +++ b/pkgs/build-support/emacs/melpa2nix.el @@ -12,5 +12,8 @@ (if (not noninteractive) (error "`melpa2nix-build-package' is to be used only with -batch")) (pcase command-line-args-left - (`(,package ,version) + (`(,package ,version ,commit) + ;; Monkey-patch package-build so it doesn't shell out to git/hg. + (defun package-build--get-commit (&rest _) + commit) (package-build--package (package-recipe-lookup package) version)))) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687c..6b53f3fdd95 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit */ -{ lib, lndir, makeWrapper, runCommand }: self: +{ lib, lndir, makeWrapper, runCommand, gcc }: self: with lib; @@ -65,7 +65,10 @@ runCommand # Store all paths we want to add to emacs here, so that we only need to add # one path to the load lists deps = runCommand "emacs-packages-deps" - { inherit explicitRequires lndir emacs; } + { + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional nativeComp gcc; + } '' findInputsOld() { local pkg="$1"; shift diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index df3129d536d..3441e2c5e7b 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -12,7 +12,6 @@ [ (if release then "-C opt-level=3" else "-C debuginfo=2") "-C codegen-units=$NIX_BUILD_CORES" - "-C incremental=no" "--remap-path-prefix=$NIX_BUILD_TOP=/" (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 3eaba1736fc..d1010ac1adb 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index d0824b17bd1..00cad9a96b5 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -193,7 +193,7 @@ let ''; in runCommand "test-writers" { - passthru = { inherit writeTest bin simple; }; + passthru = { inherit writeTest bin simple path; }; meta.platforms = lib.platforms.all; } '' ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index e76fee1a6eb..ded70a91c95 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "40.1"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk"; + sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 5fa2f1b2710..4799804b9ec 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy"; + sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q="; meta = with lib; { homepage = "https://software.sil.org/andika"; diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index 3de4cfc0cae..a1e686a320e 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.001"; in fetchzip rec { name = "doulos-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad"; + sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o="; meta = with lib; { homepage = "https://software.sil.org/doulos"; diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/data/fonts/kanit/default.nix new file mode 100644 index 00000000000..9b5be79061c --- /dev/null +++ b/pkgs/data/fonts/kanit/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "kanit"; + version = "unstable-2020-06-16"; + + src = fetchFromGitHub { + owner = "cadsondemak"; + repo = pname; + rev = "467dfe842185681d8042cd608b8291199dd37cda"; + sha256 = "0p0klb0376r8ki4ap2j99j7jcsq6wgb7m1hf3j1dkncwm7ikmg3h"; + }; + + installPhase = '' + mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname} + cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css + cp $src/fonts/otf/*.otf $out/share/fonts/opentype + cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype + ''; + + meta = with lib; { + homepage = "https://cadsondemak.github.io/kanit/"; + description = "A loopless Thai and sans serif Latin typeface for contemporary and futuristic uses"; + longDescription = '' + Kanit means mathematics in Thai, and the Kanit typeface family is a formal + Loopless Thai and Sans Latin design. It is a combination of concepts, + mixing a Humanist Sans Serif motif with the curves of Capsulated Geometric + styles that makes it suitable for various uses, contemporary and + futuristic. A notable detail is that the stroke terminals have flat angles, + which allows the design to enjoy decreased spacing between letters while + preserving readability and legibility at smaller point sizes. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.toastal ]; + }; +} diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index e647b02f010..00de4f6760c 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,32 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-11-22"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d"; + sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ gtk3 jdupes ]; propagatedBuildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; + # These fixup steps are slow and unnecessary. + dontPatchELF = true; + dontRewriteSymlinks = true; + installPhase = '' + runHook preInstall patchShebangs install.sh mkdir -p $out/share/icons name= ./install.sh -d $out/share/icons + jdupes -l -r $out/share/icons + runHook postInstall ''; meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 4cd602c620d..c15f3a011a2 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz", - "sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62", - "msg": "Update from Hackage at 2021-07-02T10:49:03Z" + "commit": "360e4a3b93ab9fc49673c9d91eebd963ddd7e132", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/360e4a3b93ab9fc49673c9d91eebd963ddd7e132.tar.gz", + "sha256": "0pzi0kjlma36s0z5wfcghn6h6lwx61vvq8f7322nz80fs4drpn64", + "msg": "Update from Hackage at 2021-07-07T20:16:30Z" } diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/data/themes/layan-gtk-theme/default.nix new file mode 100644 index 00000000000..7892fbe9f31 --- /dev/null +++ b/pkgs/data/themes/layan-gtk-theme/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, lib +, gtk-engine-murrine +}: + +stdenv.mkDerivation rec { + pname = "layan-gtk-theme"; + version = "2021-06-30"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "sha256-FI8+AJlcPHGOzxN6HUKLtPGLe8JTfTQ9Az9NsvVUK7g="; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + unset name && ./install.sh -d $out/share/themes + runHook postInstall + ''; + + meta = with lib; { + description = "A flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell."; + homepage = "https://github.com/vinceliuice/Layan-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.vanilla ]; + }; +} diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index a3d473045e9..bb825c8044e 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-06-24"; + version = "2021-07-08"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-YEa84y7ZhLqmN0kNSJR2/Txm5pZvSwuqnmckL4XnyjM="; + sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw="; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan.nix index 8a30da9e81f..c6a57ecc3bd 100644 --- a/pkgs/desktops/arcan/arcan.nix +++ b/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-07"; + version = "0.6.1pre1+unstable=2021-07-10"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5"; - hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY="; + rev = "25da999e6e03688c71c7df3852314c01ed610e0d"; + hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44="; }; postUnpack = '' diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index dba284f0100..874035c4801 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -37,6 +37,6 @@ rec { everyone-wrapped = callPackage ./wrapper.nix { name = "everyone-wrapped"; - appls = [ durden pipeworld prio ]; + appls = [ durden pipeworld ]; }; } diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden.nix index cfe41cb6ec2..f6837f96fb6 100644 --- a/pkgs/desktops/arcan/durden.nix +++ b/pkgs/desktops/arcan/durden.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+unstable=2021-06-25"; + version = "0.6.1+unstable=2021-07-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fb618fccc57a68b6ce933b4df5822acd1965d591"; - hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk="; + rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5"; + hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0="; }; installPhase = '' diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index a8b93ca1dea..4368b0ad3a5 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -21,7 +21,7 @@ symlinkJoin rec { --set ARCAN_LIBPATH "${placeholder "out"}/lib/" \ --set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \ --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \ - --set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/" + --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/" done ''; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index e48b205d180..c801342ff2c 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.0.0"; + version = "5.0.3"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "07n9p93iyrzb7636qqwknq8dd3im1y6wb9jfvif96mbvvdwsnfyz"; + sha256 = "sha256-Ah1Rp/o4LPdYm+wj2W5ljjMkCI3PgoAHrlM8yEQP77o="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 8d0e86b1a93..529596cd6e1 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hzN1mi2GpWNnWWpTSQRjO4HKqlxFpWNtsulZDHFK6Nk="; + sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 0a07428b1b2..779f1855371 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-g+gVAFTQxLWmPJoJvyx9+YmuaQ7Kwb5r97ExKqpjm9Q="; + sha256 = "sha256-p58Fz+u1UMUanGKwgDk2PXDdo90RP+cTR6lCW9cYaIk="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index c11a1df883a..ead50f1c9d1 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; + sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 226b251ec46..c8e637124ae 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "y9HdKguvw/U93kIAPEpKA3RsuNZNxdJ+uNvmc27nJ5Y="; + sha256 = "y39TbLCfWCyQdVyQl08+g9/5U56it8CWibtOCsP/yF8="; }; patches = [ diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae2255acb91..979ddafc10f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -312,7 +312,7 @@ lib.makeScope pkgs.newScope (self: with self; { # added 2019-02-08 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 diff --git a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index 501aaa91c97..ca9b8f7fb81 100644 --- a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "40.0"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; + sha256 = "v+jyHcqx70sRVlThchK8sDtqEAgzQIA/SW8ia0oILPY="; }; passthru = { diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index 57d78bf756a..f08fc7ec0df 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; + passthru.extensionUuid = "EasyScreenCast@iacopodeenosee.gmail.com"; meta = with lib; { description = "Simplifies the use of the video recording function integrated in gnome shell"; diff --git a/pkgs/desktops/gnome/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix deleted file mode 100644 index 65576d292a8..00000000000 --- a/pkgs/desktops/gnome/extensions/appindicator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-appindicator"; - version = "37"; - - src = fetchFromGitHub { - owner = "Ubuntu"; - repo = "gnome-shell-extension-appindicator"; - rev = "v${version}"; - sha256 = "1yss91n94laakzhym409iyjs5gwhln2pkq0zrdrsxc3z70zlslxl"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - uuid = "appindicatorsupport@rgcjonas.gmail.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp *.js $out/share/gnome-shell/extensions/${uuid} - cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index c3ed99b788b..f9c49111f52 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "arcmenu@arcmenu.com"; + passthru = { + extensionUuid = "arcmenu@arcmenu.com"; + extensionPortalSlug = "arcmenu"; + }; meta = with lib; { description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 8b2d538f4fe..7ac5f916736 100644 --- a/pkgs/desktops/gnome/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; - uuid = "caffeine@patapon.info"; + passthru = { + extensionPortalSlug = "caffeine"; + extensionUuid = "caffeine@patapon.info"; + }; nativeBuildInputs = [ glib gettext @@ -27,7 +30,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "caffeine@patapon.info" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix deleted file mode 100644 index efdcab6a463..00000000000 --- a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gettext, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-clipboard-indicator"; - version = "38"; - - src = fetchFromGitHub { - owner = "Tudmotu"; - repo = "gnome-shell-extension-clipboard-indicator"; - rev = "v${version}"; - sha256 = "FNrh3b6la2BuWCsriYP5gG0/KNbkFPuq/YTXTj0aJAI="; - }; - - uuid = "clipboard-indicator@tudmotu.com"; - - nativeBuildInputs = [ - gettext - glib - ]; - - makeFlags = [ - "INSTALLPATH=${placeholder "out"}/share/gnome-shell/extensions/${uuid}/" - ]; - - meta = with lib; { - description = "Adds a clipboard indicator to the top panel and saves clipboard history"; - license = licenses.mit; - maintainers = with maintainers; [ jonafato ]; - platforms = platforms.linux; - homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 3e02d33857a..1f749574c40 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { stripRoot = false; }; - uuid = "clock-override@gnomeshell.kryogenix.org"; + passthru = { + extensionUuid = "clock-override@gnomeshell.kryogenix.org"; + extensionPortalSlug = "clock-override"; + }; nativeBuildInputs = [ gettext glib ]; @@ -22,8 +25,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid} + mkdir -p "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org" + cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 97815a844d7..ebf15cada97 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "dash-to-dock@micxgx.gmail.com"; + passthru = { + extensionUuid = "dash-to-dock@micxgx.gmail.com"; + extensionPortalSlug = "dash-to-dock"; + }; meta = with lib; { description = "A dock for the Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 728f341589d..6abff2c7b41 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "dash-to-panel@jderose9.github.com"; + passthru = { + extensionUuid = "dash-to-panel@jderose9.github.com"; + extensionPortalSlug = "dash-to-panel"; + }; meta = with lib; { description = "An icon taskbar for Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 0e1167561eb..f98e2fb4e67 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,5 +1,6 @@ { lib , callPackage +, callPackages , config }: let @@ -60,14 +61,16 @@ in rec { gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames (produceExtensionsList "40")) - // (callPackage ./manuallyPackaged.nix {}) + (mapReadableNames + (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) + ) // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40."; } ); } diff --git a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix deleted file mode 100644 index 166ab61565f..00000000000 --- a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-04-13"; - - src = fetchFromGitHub { - owner = "kazysmaster"; - repo = "gnome-shell-extension-disable-unredirect"; - rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19"; - sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9"; - }; - - uuid = "unredirect@vaina.lt"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gnome-shell/extensions - cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid} - - runHook postInstall - ''; - - meta = with lib; { - description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing"; - license = licenses.gpl3Only; - homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect"; - maintainers = with maintainers; [ eduardosm ]; - }; -} diff --git a/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix deleted file mode 100644 index 90e8bffeec9..00000000000 --- a/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchgit, gettext, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-draw-on-your-screen"; - version = "10"; - - src = fetchgit { - url = "https://framagit.org/abakkk/DrawOnYourScreen/"; - rev = "v${version}"; - sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; - }; - - uuid = "drawOnYourScreen@abakkk.framagit.org"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A drawing extension for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index a994e427fb0..ebcf918df10 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; }; - uuid = "drop-down-terminal@gs-extensions.zzrough.org"; + passthru = { + extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; + extensionPortalSlug = "drop-down-terminal"; + }; patches = [ (substituteAll { @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions/ + cp -r "drop-down-terminal@gs-extensions.zzrough.org" $out/share/gnome-shell/extensions/ runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix deleted file mode 100644 index aee636d4534..00000000000 --- a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-dynamic-panel-transparency"; - version = "unstable-2021-03-04"; - - src = fetchFromGitHub { - owner = "ewlsh"; - repo = "dynamic-panel-transparency"; - rev = "f9e720e98e40c7a2d87928d09a7313c9ef2e832c"; - sha256 = "0njykxjiwlcmk0q8bsgqaznsryaw43fspfs6rzsjjz5p0xaq04nw"; - }; - - uuid = "dynamic-panel-transparency@rockon999.github.io"; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "This extension fades your top panel to nothingness when there are no maximized windows present"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome.gnome-shell.version "3.36"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index 70f09463d12..6f249bcb635 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -11,20 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; }; - uuid = "emoji-selector@maestroschan.fr"; + passthru = { + extensionUuid = "emoji-selector@maestroschan.fr"; + extensionPortalSlug = "emoji-selector"; + }; nativeBuildInputs = [ glib ]; buildPhase = '' runHook preBuild - glib-compile-schemas ./${uuid}/schemas + glib-compile-schemas "./emoji-selector@maestroschan.fr/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "emoji-selector@maestroschan.fr" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 912e47a104e..9df97998891 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -14,6 +14,8 @@ "lockkeys@fawtytoo" = "lock-keys-2"; + + # ############################################################################ # These are conflicts for 3.38 extensions. They will very probably come back # once more of them support 40. @@ -26,4 +28,24 @@ # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 #"flypie@schneegans.github.com" = null; + + + + # ############################################################################ + # Overrides for extensions that were manually packaged in the past but are gradually + # being replaced by automatic packaging where possible. + # + # The manually packaged ones: + "EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast" + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search" + "TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons" + "paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org + "no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked" + # These extensions are automatically packaged at the moment. We preserve the old attribute name + # for backwards compatibility. + "appindicatorsupport@rgcjonas.gmail.com" = "appindicator"; # extensionPortalSlug is "appindicator-support" + "unredirect@vaina.lt" = "disable-unredirect"; # extensionPortalSlug is "disable-unredirect-fullscreen-windows" + "drawOnYourScreen@abakkk.framagit.org" = "draw-on-your-screen"; # extensionPortalSlug is "draw-on-you-screen" + "timepp@zagortenay333" = "timepp"; # extensionPortalSlug is "time" + "windowIsReady_Remover@nunofarruca@gmail.com" = "window-is-ready-remover"; # extensionPortalSlug is "window-is-ready-notification-remover" } diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 9a884ac78ac..39224e6245b 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; version = "44"; - uuid = "freon@UshakovVasilii_Github.yahoo.com"; + passthru = { + extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; + extensionPortalSlug = "freon"; + }; src = fetchFromGitHub { owner = "UshakovVasilii"; @@ -17,14 +20,14 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix index 9ba9ddaf09b..552e0a2dcaf 100755 --- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a"; }; - uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; + passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index a777da990d8..96451d325bb 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -98,7 +98,10 @@ stdenv.mkDerivation rec { done ''; - uuid = "gsconnect@andyholmes.github.io"; + passthru = { + extensionUuid = "gsconnect@andyholmes.github.io"; + extensionPortalSlug = "gsconnect"; + }; passthru = { tests = { diff --git a/pkgs/desktops/gnome/extensions/gtile/default.nix b/pkgs/desktops/gnome/extensions/gtile/default.nix deleted file mode 100644 index 3430dff1355..00000000000 --- a/pkgs/desktops/gnome/extensions/gtile/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-gtile"; - version = "44"; - - src = fetchFromGitHub { - owner = "gTile"; - repo = "gTile"; - rev = "V${version}"; - sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; - }; - - uuid = "gTile@vibou"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid} - - runHook postInstall - ''; - - meta = with lib; { - description = "A window tiling extension for Gnome. This is the new official home of the vibou.gTile extension."; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ mdsp ]; - platforms = platforms.linux; - homepage = "https://github.com/gTile/gTile"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix deleted file mode 100644 index aaa5870996a..00000000000 --- a/pkgs/desktops/gnome/extensions/hot-edge/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-hot-edge"; - version = "jdoda"; - - src = fetchFromGitHub { - owner = "jdoda"; - repo = "hotedge"; - rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; - sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; - }; - - dontBuild = true; - - uuid = "hotedge@jonathan.jdoda.ca"; - - installPhase = '' - runHook preInstall - install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css - runHook postInstall - ''; - - meta = with lib; { - description = "Replace the top-left hot corner with a bottom hot edge"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jtojnar ]; - homepage = "https://github.com/jdoda/hotedge"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 820d96988c9..b5b2ae8ec74 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -11,12 +11,15 @@ stdenv.mkDerivation rec { sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; }; - uuid = "icon-hider@kalnitsky.org"; + passthru = { + extensionUuid = "icon-hider@kalnitsky.org"; + extensionPortalSlug = "icon-hider"; + }; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "icon-hider@kalnitsky.org" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 95477222163..867534ba61d 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -24,11 +24,14 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r impatience $out/share/gnome-shell/extensions/${uuid} + cp -r impatience "$out/share/gnome-shell/extensions/impatience@gfxmonk.net" runHook postInstall ''; - uuid = "impatience@gfxmonk.net"; + passthru = { + extensionUuid = "impatience@gfxmonk.net"; + extensionPortalSlug = "impatience"; + }; meta = with lib; { description = "Speed up builtin gnome-shell animations"; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 207ba6979c9..53395c5c861 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -1,40 +1,27 @@ { callPackage }: { - appindicator = callPackage ./appindicator { }; - arcmenu = callPackage ./arcmenu { }; - caffeine = callPackage ./caffeine { }; - clipboard-indicator = callPackage ./clipboard-indicator { }; - clock-override = callPackage ./clock-override { }; - dash-to-dock = callPackage ./dash-to-dock { }; - dash-to-panel = callPackage ./dash-to-panel { }; - disable-unredirect = callPackage ./disable-unredirect { }; - draw-on-your-screen = callPackage ./draw-on-your-screen { }; - drop-down-terminal = callPackage ./drop-down-terminal { }; - dynamic-panel-transparency = callPackage ./dynamic-panel-transparency { }; - easyScreenCast = callPackage ./EasyScreenCast { }; - emoji-selector = callPackage ./emoji-selector { }; - freon = callPackage ./freon { }; - fuzzy-app-search = callPackage ./fuzzy-app-search { }; - gsconnect = callPackage ./gsconnect { }; - hot-edge = callPackage ./hot-edge { }; - icon-hider = callPackage ./icon-hider { }; - impatience = callPackage ./impatience { }; - material-shell = callPackage ./material-shell { }; - mpris-indicator-button = callPackage ./mpris-indicator-button { }; - night-theme-switcher = callPackage ./night-theme-switcher { }; - no-title-bar = callPackage ./no-title-bar { }; - noannoyance = callPackage ./noannoyance { }; - paperwm = callPackage ./paperwm { }; - pidgin-im-integration = callPackage ./pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ./remove-dropdown-arrows { }; - sound-output-device-chooser = callPackage ./sound-output-device-chooser { }; - system-monitor = callPackage ./system-monitor { }; - taskwhisperer = callPackage ./taskwhisperer { }; - tilingnome = callPackage ./tilingnome { }; - timepp = callPackage ./timepp { }; - topicons-plus = callPackage ./topicons-plus { }; - unite = callPackage ./unite { }; - window-corner-preview = callPackage ./window-corner-preview { }; - window-is-ready-remover = callPackage ./window-is-ready-remover { }; - workspace-matrix = callPackage ./workspace-matrix { }; + "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; + "caffeine@patapon.info" = callPackage ./caffeine { }; + "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; + "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; + "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; + "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; + "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; + "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; + "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; + "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; + "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; + "impatience@gfxmonk.net" = callPackage ./impatience { }; + "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; + "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; + "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; + "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; + "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; + "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; + "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; + "TopIcons@phocean.net" = callPackage ./topicons-plus { }; + "unite@hardpixel.eu" = callPackage ./unite { }; + "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; } diff --git a/pkgs/desktops/gnome/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix deleted file mode 100644 index 9b683c1af6b..00000000000 --- a/pkgs/desktops/gnome/extensions/material-shell/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-material-shell"; - version = "12"; - - src = fetchFromGitHub { - owner = "material-shell"; - repo = "material-shell"; - rev = version; - sha256 = "0ikrh70drwr0pqjcdz7l1ky8xllpnk7myprjd4s61nqkx9j2iz44"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ - runHook postInstall - ''; - - uuid = "material-shell@papyelgringo"; - - meta = with lib; { - description = "A modern desktop interface for Linux"; - license = licenses.mit; - maintainers = with maintainers; [ benley ]; - homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome.gnome-shell.meta.platforms; - }; -} diff --git a/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix deleted file mode 100644 index 8d9faaa89ad..00000000000 --- a/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-mpris-indicator-button-unstable"; - version = "2020-03-21"; - - src = fetchFromGitHub { - owner = "JasonLG1979"; - repo = "gnome-shell-extension-mpris-indicator-button"; - rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3"; - sha256 = "0n5qlx51fxjq1nn10zhdwfy905j20sv7pwh2jc6fns757ac4pwwk"; - }; - - uuid = "mprisindicatorbutton@JasonLG1979.github.io"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = "gnomeExtensions.${pname}"; - }; - }; - - - meta = with lib; { - description = "A simple MPRIS indicator button for GNOME Shell"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome.gnome-shell.version "3.34"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index a7ee6d566d4..d57ccdcff83 100644 --- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -14,12 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ glib gnome.gnome-shell ]; - uuid = "nightthemeswitcher@romainvigier.fr"; + passthru = { + extensionUuid = "nightthemeswitcher@romainvigier.fr"; + extensionPortalSlug = "night-theme-switcher"; + }; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} + unzip "build/nightthemeswitcher@romainvigier.fr.shell-extension.zip" -d "$out/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index ad588be18ce..e46b49c8f6e 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "no-title-bar@jonaspoehler.de"; + passthru = { + extensionUuid = "no-title-bar@jonaspoehler.de"; + }; meta = with lib; { description = "Integrates maximized windows with the top panel"; diff --git a/pkgs/desktops/gnome/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix deleted file mode 100644 index 1a53e6abd55..00000000000 --- a/pkgs/desktops/gnome/extensions/noannoyance/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-noannoyance"; - version = "unstable-2021-01-17"; - - src = fetchFromGitHub { - owner = "BjoernDaase"; - repo = "noannoyance"; - rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; - sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; - }; - - uuid = "noannoyance@daase.net"; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} - ''; - - meta = with lib; { - description = "Removes the 'Window is ready' notification and puts the window into focus"; - homepage = "https://github.com/BjoernDaase/noannoyance"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tu-maurice ]; - }; -} diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 201628b4b42..627c4b3f2c3 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs"; }; - uuid = "paperwm@hedning:matrix.org"; + passthru.extensionUuid = "paperwm@hedning:matrix.org"; dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} + mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" + cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 93ffcda830a..92e0bfe94d7 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - uuid = "pidgin@muffinmad"; + passthru = { + extensionUuid = "pidgin@muffinmad"; + extensionPortalSlug = "pidgin-im-integration"; + }; meta = with lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; diff --git a/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix deleted file mode 100644 index e310f5dcf10..00000000000 --- a/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-remove-dropdown-arrows"; - version = "13"; - - src = fetchFromGitHub { - owner = "mpdeimos"; - repo = "gnome-shell-remove-dropdown-arrows"; - rev = "version/${version}"; - sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk"; - }; - - # This package has a Makefile, but it's used for publishing and linting, not - # for building. Disable the build phase so installing doesn't attempt to - # publish the extension. - dontBuild = true; - - uuid = "remove-dropdown-arrows@mpdeimos.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp extension.js $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Remove dropdown arrows from GNOME Shell Menus"; - license = licenses.gpl3; - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index f01a2cd545e..e439e5b5a50 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { dontBuild = true; - uuid = "sound-output-device-chooser@kgshank.net"; + passthru = { + extensionUuid = "sound-output-device-chooser@kgshank.net"; + extensionPortalSlug = "sound-output-device-chooser"; + }; makeFlags = [ "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 0a959de2681..439f02622a6 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -28,18 +28,21 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions runHook postInstall ''; - uuid = "system-monitor@paradoxxx.zero.gmail.com"; + passthru = { + extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; + extensionPortalSlug = "system-monitor"; + }; meta = with lib; { description = "Display system informations in gnome shell status bar"; diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 68d07e2d142..19936f6be61 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { taskwarrior ]; - uuid = "taskwhisperer-extension@infinicode.de"; + passthru = { + extensionUuid = "taskwhisperer-extension@infinicode.de"; + extensionPortalSlug = "taskwhisperer"; + }; makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index c1ca77d9d73..42c6467dba8 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -21,12 +21,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ + mkdir -p "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com" + cp -r * "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com/" runHook postInstall ''; - uuid = "tilingnome@rliang.github.com"; + passthru = { + extensionUuid = "tilingnome@rliang.github.com"; + extensionPortalSlug = "tilingnome"; + }; meta = with lib; { description = "Tiling window management for GNOME Shell"; diff --git a/pkgs/desktops/gnome/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix deleted file mode 100644 index cb4234a2513..00000000000 --- a/pkgs/desktops/gnome/extensions/timepp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-timepp"; - version = "unstable-2020-03-15"; - - src = fetchFromGitHub { - owner = "zagortenay333"; - repo = "timepp__gnome"; - rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; - sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; - }; - - uuid = "timepp@zagortenay333"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; - homepage = "https://github.com/zagortenay333/timepp__gnome"; - license = licenses.gpl3; - maintainers = with maintainers; [ svsdep ]; - }; -} diff --git a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix index 084548e1a10..eedfeb098c0 100644 --- a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - uuid = "TopIcons@phocean.net"; + passthru.extensionUuid = "TopIcons@phocean.net"; meta = with lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 228cb706150..776139b3686 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; }; - uuid = "unite@hardpixel.eu"; + passthru = { + extensionUuid = "unite@hardpixel.eu"; + extensionPortalSlug = "unite"; + }; nativeBuildInputs = [ glib ]; @@ -19,14 +22,14 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + glib-compile-schemas --strict --targetdir="unite@hardpixel.eu/schemas/" "unite@hardpixel.eu/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "unite@hardpixel.eu" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 0e71345bb8a..ef0e22b7abe 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation rec { dontBuild = true; - uuid = "window-corner-preview@fabiomereu.it"; + passthru = { + extensionUuid = "window-corner-preview@fabiomereu.it"; + extensionPortalSlug = "window-corner-preview"; + }; + installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "window-corner-preview@fabiomereu.it" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix deleted file mode 100644 index 3f0e9e71b57..00000000000 --- a/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-window-is-ready-remover"; - version = "1.02"; - - src = fetchFromGitHub { - owner = "nunofarruca"; - repo = "WindowIsReady_Remover"; - rev = "v${version}"; - sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; - }; - - uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/ - cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension removing window is ready notification"; - homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; - license = licenses.asl20; - }; -} diff --git a/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix deleted file mode 100644 index eb1d6e7e319..00000000000 --- a/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, findutils, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-workspace-matrix"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "mzur"; - repo = "gnome-shell-wsmatrix"; - rev = "v${version}"; - sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd"; - }; - - uuid = "wsmatrix@martin.zurowietz.de"; - - nativeBuildInputs = [ - findutils - glib - ]; - - buildFlags = "schemas"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chkno ]; - homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; - }; -} diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 18986400c00..03ef891d710 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -1,21 +1,22 @@ { gsmakeDerivation , cairo -, fetchurl +, fetchzip , base, gui , xlibsWrapper , freetype , pkg-config , libXmu }: -let + +gsmakeDerivation rec { + pname = "gnustep-back"; version = "0.28.0"; -in -gsmakeDerivation { - name = "gnustep-back-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "1nkmk7qli2ld6gw9h4kqa199i8q2m9x9d46idxh1k0rb41kf3i2c"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index e661dae9099..4fe005c3749 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -1,7 +1,7 @@ { aspell, audiofile , gsmakeDerivation , cups -, fetchurl, fetchpatch +, fetchzip , gmp, gnutls , libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib @@ -11,14 +11,12 @@ , pkg-config, portaudio , libiberty }: -let - version = "1.27.0"; -in -gsmakeDerivation { - name = "gnustep-base-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8"; +gsmakeDerivation rec { + pname = "gnustep-base"; + version = "1.28.0"; + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; }; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ @@ -35,13 +33,10 @@ gsmakeDerivation { ]; patches = [ ./fixup-paths.patch - (fetchpatch { # for icu68 compatibility, remove with next update(?) - url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch"; - sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852"; - }) ]; meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; + changelog = "https://github.com/gnustep/libs-base/releases/tag/base-${builtins.replaceStrings [ "." ] [ "_" ] version}"; }; } diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 3817edad36b..6320d0d2ff2 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,11 @@ -{ fetchurl, base, back, gsmakeDerivation, gui }: -let - version = "1.2.26"; -in -gsmakeDerivation { - name = "gorm-${version}"; +{ fetchzip, base, back, gsmakeDerivation, gui }: +gsmakeDerivation rec { + pname = "gorm"; + version = "1.2.28"; - src = fetchurl { + src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "063f8rlz8py931hfrh95jxvr68bzs33bvckfigzbagp73n892jnw"; + sha256 = "0n92xr16w0wnwfzh7i9xhsly61pyz9l9f615dp324a6r3444hn0z"; }; buildInputs = [ base back gui ]; diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index 8356a608c83..e8c3ea27fa4 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,22 +1,19 @@ -{ gsmakeDerivation, fetchurl, fetchpatch, base }: -let - version = "0.28.0"; -in -gsmakeDerivation { - name = "gnustep-gui-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z"; +{ gsmakeDerivation, fetchzip, base }: + +gsmakeDerivation rec { + version = "0.29.0"; + pname = "gnustep-gui"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "0x6n48p178r4zd8f4sqjfqd6rp49w00wr59w19lpwlmrdv7bn538"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch - (fetchpatch { # for icu68 compatibility, remove with next update(?) - url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch"; - sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc"; - }) ]; meta = { description = "A GUI class library of GNUstep"; + changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${builtins.replaceStrings [ "." ] [ "_" ] version}"; }; } diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index f96eb7388b3..ce2c1f2f144 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, clang, which, libobjc }: -let - version = "2.9.0"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnustep-make"; - inherit version; + version = "2.9.0"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; @@ -32,6 +28,7 @@ stdenv.mkDerivation { meta = { description = "A build manager for GNUstep"; homepage = "http://gnustep.org/"; + changelog = "https://github.com/gnustep/tools-make/releases/tag/make-${builtins.replaceStrings [ "." ] [ "_" ] version}"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; platforms = lib.platforms.unix; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index e8b10227eaa..50a32420de0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,11 +11,12 @@ , gtk3 , granite , libgee +, libhandy , elementary-icon-theme , appstream , libpeas , editorconfig-core-c -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libsoup , vte @@ -25,11 +25,12 @@ , ctags , libgit2-glib , wrapGAppsHook +, polkit }: stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.4.1"; + version = "6.0.0"; repoName = "code"; @@ -37,17 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; + sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; - sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -60,6 +53,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + + # polkit is needed for ITS rules + polkit + python3 vala wrapGAppsHook @@ -71,10 +68,11 @@ stdenv.mkDerivation rec { elementary-icon-theme granite gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libgee libgit2-glib + libhandy libpeas libsoup vte diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 21aeb38530f..2e20314d480 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -11,15 +11,17 @@ , glib , granite , libgee +, libhandy , elementary-icon-theme , elementary-gtk-theme , gettext , wrapGAppsHook +, appstream }: stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "1.0"; + version = "6.0.0"; repoName = "feedback"; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU="; + sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv"; }; passthru = { @@ -47,11 +49,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream elementary-icon-theme granite gtk3 elementary-gtk-theme libgee + libhandy glib ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 5a5c314b3e9..fe6c3f187fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -16,6 +15,7 @@ , json-glib , libgda , libgpod +, libhandy , libnotify , libpeas , libsoup @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "5.0.5"; + version = "5.1.0"; repoName = "music"; @@ -39,17 +39,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; + sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; - sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -82,6 +74,7 @@ stdenv.mkDerivation rec { libgda libgee libgpod + libhandy libnotify libpeas libsignon-glib diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 7280051361a..bced420dbc0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , meson @@ -12,6 +11,7 @@ , libaccounts-glib , libexif , libgee +, libhandy , geocode-glib , gexiv2 , libgphoto2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.0"; + version = "2.7.1"; repoName = "photos"; @@ -43,17 +43,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY="; + sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch"; - sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -88,6 +80,7 @@ stdenv.mkDerivation rec { libgee libgphoto2 libgudev + libhandy libraw librest libsoup diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 46f279dd795..6e6beba50ce 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -12,6 +12,7 @@ , gtk3 , libxml2 , granite +, libhandy , libnotify , vte , libgee @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "5.5.2"; + version = "6.0.0"; repoName = "terminal"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-giVmL0zYEVYJ40ZBQ9dDb4hOx4HaYRt7tUTOu37lMYU="; + sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc"; }; passthru = { @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libnotify pcre2 vte diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index e5506093719..95df9a613a8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-videos"; - version = "2.7.2"; + version = "2.7.3"; repoName = "videos"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-MSyhCXsziQ0MD4lGp9X/9odidjT/L+2Aihwd1qCGvB0="; + sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7"; }; passthru = { diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 55935b2ee0e..bd4845172c5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "elementary-icon-theme"; - version = "5.3.1"; + version = "6.0.0"; repoName = "icons"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-6XFzjpuHpGIZ+azkPuFcSF7p66sDonwLwjvlNBZDRmc="; + sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b"; }; passthru = { diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 3d4dc6bd84a..2397dd8ffcf 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.0.0"; + version = "6.1.0"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0="; + sha256 = "02hn4abnsn6fm2m33pjmlnkj8dljsm292z62vn8ccvy7l8f9my6l"; }; passthru = { diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index ee8bbeabbfe..344835b831b 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,30 +1,74 @@ -{ stdenv, lib, buildPythonApplication -, ajsonrpc -, bottle -, click -, click-completion -, colorama +{ stdenv, lib, python3 +, fetchFromGitHub , git -, jsondiff -, lockfile -, marshmallow -, pyelftools -, pyserial -, pytest -, requests -, semantic-version , spdx-license-list-data -, starlette -, tabulate -, tox -, uvicorn -, wsproto -, zeroconf , version, src }: let - args = lib.concatStringsSep " " ((map (e: "--deselect tests/${e}") [ + python = python3.override { + packageOverrides = self: super: { + aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + version = "0.6.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"; + }; + }); + + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "7.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + }; + }); + + uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { + version = "0.13.2"; + src = fetchFromGitHub { + owner = "encode"; + repo = "uvicorn"; + rev = version; + sha256 = "04zgmp9z46k72ay6cz7plga6d3w3a6x41anabm7ramp7jdqf6na9"; + }; + }); + }; + }; +in +with python.pkgs; buildPythonApplication rec { + pname = "platformio"; + inherit version src; + + propagatedBuildInputs = [ + ajsonrpc + bottle + click + click-completion + colorama + git + lockfile + marshmallow + pyelftools + pyserial + requests + semantic-version + starlette + tabulate + uvicorn + wsproto + zeroconf + ]; + + HOME = "/tmp"; + + checkInputs = [ + jsondiff + pytestCheckHook + tox + ]; + + pytestFlagsArray = (map (e: "--deselect tests/${e}") [ "commands/test_ci.py::test_ci_boards" "commands/test_ci.py::test_ci_build_dir" "commands/test_ci.py::test_ci_keep_build_dir" @@ -88,44 +132,10 @@ let "commands/test_update.py" "test_maintenance.py" "test_ino2cpp.py" - ])); - -in buildPythonApplication rec { - pname = "platformio"; - inherit version src; - - propagatedBuildInputs = [ - ajsonrpc - bottle - click - click-completion - colorama - git - lockfile - marshmallow - pyelftools - pyserial - requests - semantic-version - starlette - tabulate - uvicorn - wsproto - zeroconf + ]) ++ [ + "tests" ]; - HOME = "/tmp"; - - checkInputs = [ pytest tox jsondiff ]; - - checkPhase = '' - runHook preCheck - - py.test -v tests ${args} - - runHook postCheck - ''; - patches = [ ./fix-searchpath.patch ./use-local-spdx-license-list.patch diff --git a/pkgs/development/compilers/fennel/default.nix b/pkgs/development/compilers/fennel/default.nix new file mode 100644 index 00000000000..6165a522c3a --- /dev/null +++ b/pkgs/development/compilers/fennel/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromSourcehut, installShellFiles, lua }: + +stdenv.mkDerivation rec { + pname = "fennel"; + version = "0.9.2"; + + src = fetchFromSourcehut { + owner = "~technomancy"; + repo = pname; + rev = version; + sha256 = "1kpm3lzxzwkhxm4ghpbx8iw0ni7gb73y68lsc3ll2rcx0fwv9303"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ lua ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postInstall = '' + installManPage fennel.1 + ''; + + meta = with lib; { + description = "A Lua Lisp language"; + homepage = "https://fennel-lang.org/"; + license = licenses.mit; + platforms = lua.meta.platforms; + maintainers = [ maintainers.maaslalani ]; + }; +} diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 943ddd100a2..441ce6cdcd5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "10-2020-q4-major"; + version = "10.2.1"; + release = "10-2020-q4-major"; subdir = "10-2020q4"; suffix = { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 266863d95b2..bab73948ace 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "6-2017-q2-update"; + version = "6.3.1"; + release = "6-2017-q2-update"; subdir = "6-2017q2"; suffix = { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4f2135446f6..ccd99e096f8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "7-2018-q2-update"; + version = "7.3.1"; + release = "7-2018-q2-update"; subdir = "7-2018q2"; suffix = { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 2d85113527c..363e87ecb65 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "8-2019-q3-update"; + version = "8.3.1"; + release = "8-2019-q3-update"; subdir = "8-2019q3/RC1.1"; suffix = { @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 944d7c7b159..6ff1567286d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "9-2020-q2-update"; + version = "9.3.1"; + release = "9-2020-q2-update"; subdir = "9-2020q2"; suffix = { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index ad1a47e5cc9..3ef4ebb9b98 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl, perl, gcc -, ncurses6, gmp, glibc, libiconv, numactl +, ncurses5 +, ncurses6, gmp, libiconv, numactl , llvmPackages # minimal = true; will remove files that aren't strictly necessary for @@ -14,68 +15,191 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let + downloadsUrl = "https://downloads.haskell.org/ghc"; + + version = "8.10.2"; + + # Information about available bindists that we use in the build. + # + # # Bindist library checking + # + # The field `archSpecificLibraries` also provides a way for us get notified + # early when the upstream bindist changes its dependencies (e.g. because a + # newer Debian version is used that uses a new `ncurses` version). + # + # Usage: + # + # * You can find the `fileToCheckFor` of libraries by running `readelf -d` + # on the compiler binary (`exePathForLibraryCheck`). + # * To skip library checking for an architecture, + # set `exePathForLibraryCheck = null`. + # * To skip file checking for a specific arch specfic library, + # set `fileToCheckFor = null`. + ghcBinDists = { + # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) + # nixpkgs uses for the respective system. + defaultLibc = { + i686-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, + # which link it against `libtinfo.so.5` (ncurses 5). + # Other bindists are linked `libtinfo.so.6` (ncurses 6). + { nixPackage = ncurses5; fileToCheckFor = "libtinfo.so.5"; } + ]; + }; + x86_64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + armv7l-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + ]; + }; + aarch64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; + }; + exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2"; + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = "libtinfo.so.6"; } + { nixPackage = numactl; fileToCheckFor = null; } + ]; + }; + x86_64-darwin = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; + }; + exePathForLibraryCheck = null; # we don't have a library check for darwin yet + archSpecificLibraries = [ + { nixPackage = ncurses6; fileToCheckFor = null; } + { nixPackage = libiconv; fileToCheckFor = null; } + ]; + }; + }; + # Binary distributions for the musl libc for the respective system. + musl = { + x86_64-linux = { + src = { + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz"; + sha256 = "0xpcbyaxqyhbl6f0i3s4rp2jm67nqpkfh2qlbj3i2fiaix89ml0l"; + }; + exePathForLibraryCheck = "bin/ghc"; + archSpecificLibraries = [ + # In contrast to glibc builds, the musl-bindist uses `libncursesw.so.*` + # instead of `libtinfo.so.*.` + { nixPackage = ncurses6; fileToCheckFor = "libncursesw.so.6"; } + ]; + }; + }; + }; + + distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; + + binDistUsed = ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); + useLLVM = !stdenv.targetPlatform.isx86; - libPath = lib.makeLibraryPath ([ - ncurses6 gmp - ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv - ++ lib.optional (stdenv.hostPlatform.isAarch64) numactl); + libPath = + lib.makeLibraryPath ( + [ + gmp + ] + # Add arch-specific libraries. + ++ map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries + ); libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - glibcDynLinker = assert stdenv.isLinux; - if stdenv.hostPlatform.libc == "glibc" then - # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. - ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' - else - "${lib.getLib glibc}/lib/ld-linux*"; - - downloadsUrl = "https://downloads.haskell.org/ghc"; - in stdenv.mkDerivation rec { - version = "8.10.2"; + inherit version; name = "ghc-${version}-binary"; - # https://downloads.haskell.org/~ghc/8.10.2/ - src = fetchurl ({ - i686-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; - }; - x86_64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; - sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; - }; - armv7l-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; - sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; - }; - aarch64-linux = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; - }; - x86_64-darwin = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); + src = fetchurl binDistUsed.src; nativeBuildInputs = [ perl ]; - propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; + propagatedBuildInputs = + lib.optionals useLLVM [ llvmPackages.llvm ] + # Because musl bindists currently provide no way to tell where + # libgmp is (see not [musl bindists have no .buildinfo]), we need + # to propagate `gmp`, otherwise programs built by this ghc will + # fail linking with `cannot find -lgmp` errors. + # Also, as of writing, the release pages of musl bindists claim + # that they use `integer-simple` and do not require `gmp`; however + # that is incorrect, so `gmp` is required until a release has been + # made that includes https://gitlab.haskell.org/ghc/ghc/-/issues/20059. + # (Note that for packaging the `-binary` compiler, nixpkgs does not care + # about whether or not `gmp` is used; this comment is just here to explain + # why the `gmp` dependency exists despite what the release page says.) + ++ lib.optionals stdenv.hostPlatform.isMusl [ gmp ]; # musl bindist needs this + # Set LD_LIBRARY_PATH or equivalent so that the programs running as part + # of the bindist installer can find the libraries they expect. # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location/ + # the final install location. ${libEnvVar} = libPath; postUnpack = + # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, + # so that we know when ghc bindists upgrade that and we need to update the + # version used in `libPath`. + lib.optionalString + (binDistUsed.exePathForLibraryCheck != null) + # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. + # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. + # As a result, don't shell-quote this glob when splicing the string. + (let buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; in + lib.concatStringsSep "\n" [ + ('' + echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" + if ! test -e ${buildExeGlob}; then + echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '') + (lib.concatMapStringsSep + "\n" + ({ fileToCheckFor, nixPackage }: + lib.optionalString (fileToCheckFor != null) '' + echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" + if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then + echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + + echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" + if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then + echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; + fi + '' + ) + binDistUsed.archSpecificLibraries + ) + ]) # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib # during linking - lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" # not enough room in the object files for the full path to libiconv :( for exe in $(find . -type f -executable); do @@ -91,6 +215,9 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/configure '' + # We have to patch the GMP paths for the integer-gmp package. + # Note [musl bindists have no .buildinfo] + # Note that musl bindists do not contain them; unclear if that's intended; + # see: https://gitlab.haskell.org/ghc/ghc/-/issues/20073#note_363231 '' find . -name integer-gmp.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; @@ -106,21 +233,8 @@ stdenv.mkDerivation rec { '' + # Rename needed libraries and binaries, fix interpreter lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.6 libncurses.so \ - --interpreter ${glibcDynLinker} {} \; - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - '' + - # We're kludging a glibc bindist into working with non-glibc... - # Here we patch up the use of `__strdup` (part of glibc binary ABI) - # to instead use `strdup` since musl doesn't provide __strdup - # (`__strdup` is defined to be an alias of `strdup` anyway[1]). - # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html - # Use objcopy magic to make the change: - lib.optionalString stdenv.hostPlatform.isMusl '' - find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; + find . -type f -executable -exec patchelf \ + --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; ''; # fix for `configure: error: Your linker is affected by binutils #16177` @@ -130,15 +244,33 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + # From: https://github.com/NixOS/nixpkgs/pull/43369/commits ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # No building is necessary, but calling make without flags ironically # calls install-strip ... dontBuild = true; + # Apparently necessary for the ghc Alpine (musl) bindist: + # When we strip, and then run the + # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + # below, running ghc (e.g. during `installCheckPhase)` gives some apparently + # corrupted rpath or whatever makes the loader work on nonsensical strings: + # running install tests + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found + # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found + # This is extremely bogus and should be investigated. + dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness + # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. postFixup = lib.optionalString stdenv.isLinux @@ -186,13 +318,23 @@ stdenv.mkDerivation rec { find $out -type f -name '*.p_o' -delete find $out -type f -name '*.p_hi' -delete find $out -type f -name '*_p.a' -delete - rm $out/lib/ghc-*/bin/ghc-iserv-prof + # `-f` because e.g. musl bindist does not have this file. + rm -f $out/lib/ghc-*/bin/ghc-iserv-prof # Hydra will redistribute this derivation, so we have to keep the docs for # legal reasons (retaining the legal notices etc) # As a last resort we could unpack the docs separately and symlink them in. # They're in $out/share/{doc,man}. ''; + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + doInstallCheck = true; installCheckPhase = '' unset ${libEnvVar} @@ -221,7 +363,16 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; license = lib.licenses.bsd3; - platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + # HACK: since we can't encode the libc / abi in platforms, we need + # to make the platform list dependent on the evaluation platform + # in order to avoid eval errors with musl which supports less + # platforms than the default libcs (i. e. glibc / libSystem). + # This is done for the benefit of Hydra, so `packagePlatforms` + # won't return any platforms that would cause an evaluation + # failure for `pkgsMusl.haskell.compiler.ghc8102Binary`, as + # long as the evaluator runs on a platform that supports + # `pkgsMusl`. + platforms = builtins.attrNames ghcBinDists.${distSetName}; hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; maintainers = with lib.maintainers; [ lostnet ]; }; diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index f007dcf7898..10ca2f6662c 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -38,6 +38,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -45,6 +59,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -60,14 +78,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + lib.optionalString enableRelocatedStaticLibs '' @@ -217,8 +247,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -238,7 +270,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 8a0994b8b6a..ea4542a38b2 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -121,8 +121,9 @@ stdenv.mkDerivation rec { configurePlatforms = [ ]; configureFlags = [ - "--with-gmp-libraries=${lib.getLib gmp}/lib" "--with-gmp-includes=${lib.getDev gmp}/include" + # Note `--with-gmp-libraries` does nothing for GHC bindists: + # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124 ] ++ lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; @@ -152,6 +153,15 @@ stdenv.mkDerivation rec { done ''; + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + hardeningDisable = lib.optional stdenv.targetPlatform.isMusl "pie"; + doInstallCheck = true; installCheckPhase = '' unset ${libEnvVar} @@ -180,5 +190,7 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; + # build segfaults, use ghc8102Binary which has proper musl support instead + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 544b96f5e4f..23826614716 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -38,6 +38,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -45,6 +59,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -60,6 +78,21 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' @@ -72,9 +105,6 @@ let + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString dontStrip '' STRIP_CMD = : '' + lib.optionalString (!enableProfiledLibs) '' @@ -142,11 +172,14 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. - preConfigure = lib.optionalString stdenv.isAarch64 '' + preConfigure = # Aarch64 allow backward bootstrapping since earlier versions are unstable. - find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ - -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; - '' + '' + # Same for musl, as earlier versions do not provide a musl bindist for bootstrapping. + lib.optionalString (stdenv.isAarch64 || stdenv.hostPlatform.isMusl) '' + find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ + -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; + '' + + '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done @@ -224,8 +257,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -245,7 +280,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index f5a6b5f32fa..d2ae51c66de 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -39,6 +39,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -46,6 +60,10 @@ assert !enableIntegerSimple -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -61,14 +79,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + lib.optionalString enableRelocatedStaticLibs '' @@ -143,7 +173,7 @@ stdenv.mkDerivation (rec { echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" '' + lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -204,8 +234,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx + perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -225,7 +257,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index ec236731afd..2ea14b78cc4 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -46,6 +46,20 @@ ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (if useLLVM then "perf-cross" else "perf-cross-ncg") +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pullls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 @@ -53,6 +67,10 @@ assert !enableNativeBignum -> gmp != null; +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -68,14 +86,26 @@ let ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO '' + lib.optionalString dontStrip '' STRIP_CMD = : '' + lib.optionalString (!enableProfiledLibs) '' @@ -221,8 +251,10 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - perl autoconf autoreconfHook automake m4 python3 sphinx + perl autoconf autoreconfHook automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals enableDocs [ + sphinx ]; # For building runtime libs @@ -242,7 +274,16 @@ stdenv.mkDerivation (rec { checkTarget = "test"; - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; postInstall = '' # Install the bash completion file. diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 0a9b0ba9b27..8dee4cae896 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.13"; + version = "1.15.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-mQaeciNHnM5FU/hPh0uTRfb0BF8nz1CJSJtUbaYZokQ="; + sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 26cfb898ecf..f85d2bba907 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.5"; + version = "1.16.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA="; + sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 87bf767f5bd..b21f0196d4b 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.4.5"; + name = "gprolog-1.5.0"; src = fetchurl { urls = [ "mirror://gnu/gprolog/${name}.tar.gz" "http://www.gprolog.org/${name}.tar.gz" ]; - sha256 = "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z"; + sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE="; }; hardeningDisable = lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ac0f3312414..c399772a9f3 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { postInstall = let includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; - packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; + packagePaths = + builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index a8b4a76b7de..512e0aa0247 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg="; + sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; }; postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet ''; - cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys="; + cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; meta = { description = "Purely-functional configuration language that helps you define JSON data"; diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 6502890af2b..0af98bbfc07 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -10,8 +10,7 @@ }: let deps = import ./deps.nix { inherit fetchurl; }; - - version = "2020-10-08"; + version = "2021-05-20"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +48,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67"; - sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg"; + rev = "86825796eae15d4d46919bc6e32f1197196ba1b3"; + sha256 = "sha256-izDE7Oil9g47Jf3eHPtW5coNixF71t9i0oYSuelakCo="; }; buildInputs = [dotnet-sdk_3 openssl icu]; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8b058b2dc05..6a769a47ef8 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-06-12"; + version = "unstable-2021-07-08"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/01feffa0aeee835504e0c0ccf4bca2e33a698252.tar.gz"; - sha256 = "0clckh0qqvjcb8szy1d6qqlxj6sqp28jc2p3vhzhkf95cv491si9"; + url = "https://github.com/NixOS/cabal2nix/archive/b28902718d89f6a14a836d95a7093bc46e4f8bb5.tar.gz"; + sha256 = "1jdbz0krwzzsl3vb10xgman642v49bbgwyl6dw3p9aw6s7a8nfgk"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e22f86a009..9594c0788c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1828,22 +1828,30 @@ EOT # 2021-05-09: compilation requires patches from master, # remove at next release (current is 0.1.0.4). - large-hashable = appendPatches super.large-hashable [ - # Fix compilation of TH code for GHC >= 8.8 - (pkgs.fetchpatch { - url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; - sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; - excludes = [ - ".travis.yml" - "stack**" - ]; - }) - # Fix cpp invocation - (pkgs.fetchpatch { - url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; - sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; - }) - ]; + large-hashable = overrideCabal super.large-hashable (drv: { + # fix line endings which are an issue all of a sudden for an unknown reason + prePatch = '' + find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix + '' + (drv.prePatch or ""); + # allow newer template haskell + jailbreak = true; + patches = [ + # Fix compilation of TH code for GHC >= 8.8 + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch"; + sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv"; + excludes = [ + ".travis.yml" + "stack**" + ]; + }) + # Fix cpp invocation + (pkgs.fetchpatch { + url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch"; + sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx"; + }) + ]; + }); # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 @@ -1938,6 +1946,14 @@ EOT # Flakey tests # upstream https://github.com/circuithub/rel8/issues/86 - rel8 = dontCheck super.rel8; + rel8 = dontCheck (super.rel8.override { + opaleye = dontCheck super.opaleye_0_7_2_0; + }); + + # Release 1.0.0.0 added version bounds (was unrestricted before), + # but with too strict lower bounds for our lts-18. + graphql = assert pkgs.lib.versionOlder self.parser-combinators.version "1.3.0"; + assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; + doJailbreak super.graphql; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 7731c73f0f6..20c64dbbccf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -106,7 +106,7 @@ self: super: { retry = dontCheck super.retry; # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_0.overrideScope (self: super: { + hlint = super.hlint_3_3_1.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { doHaddock = false; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 13bd569a443..302c2722ee0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -91,6 +91,7 @@ broken-packages: - Agata - agda-language-server - agda-snippets + - agda-unused - AGI - ag-pictgen - AhoCorasick @@ -661,6 +662,7 @@ broken-packages: - clock-extras - clogparse - clone-all + - closed-intervals - closure - cloudfront-signer - clr-inline @@ -1090,6 +1092,7 @@ broken-packages: - doctest-prop - docusign-example - docvim + - dominion - domplate - do-spaces - dotfs @@ -1778,6 +1781,7 @@ broken-packages: - hakismet - hakka - hako + - hakyll-agda - hakyll-blaze-templates - hakyll-contrib - hakyll-contrib-csv @@ -2205,6 +2209,7 @@ broken-packages: - Hricket - hs2bf - hs2ps + - hsakamai - hsaml2 - hsay - hsbc @@ -2382,6 +2387,7 @@ broken-packages: - hw-json-simd - hw-mquery - hworker + - hw-prim-bits - hw-simd - hwsl2 - hx @@ -3108,6 +3114,7 @@ broken-packages: - MuCheck - mud - muesli + - mu-graphql - mulang - multext-east-msd - multiaddr @@ -3266,6 +3273,8 @@ broken-packages: - np-extras - np-linear - nptools + - nri-kafka + - nri-postgresql - ntp-control - ntrip-client - n-tuple @@ -4508,6 +4517,7 @@ broken-packages: - streamdeck - streamed - stream-fusion + - streaming-benchmarks - streaming-conduit - streaming-events - streaming-lzma @@ -4535,6 +4545,7 @@ broken-packages: - stripe-http-streams - stripe-signature - stripe-tests + - strong-path - strongswan-sql - structural-traversal - structures @@ -4749,6 +4760,7 @@ broken-packages: - thrift - Thrift - throttled-io-loop + - throwable-exceptions - th-sccs - th-tc - th-to-exp @@ -4793,6 +4805,7 @@ broken-packages: - Titim - tkhs - tkyprof + - tmp-postgres - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 45d0bdcd0cb..c63942afe1a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,6 +115,7 @@ extra-packages: - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 + - opaleye < 0.7.3.0 # 2021-07-11: for rel8 <= 1.0.0.1, see https://github.com/circuithub/rel8/issues/95#issuecomment-877616118 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 69f518322c2..2098609cd69 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.0 +# Stackage LTS 18.1 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -33,7 +33,7 @@ default-package-overrides: - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 - - Agda ==2.6.1.3 + - Agda ==2.6.2 - agda2lagda ==0.2021.6.1 - al ==0.1.4.2 - alarmclock ==0.7.0.5 @@ -202,8 +202,8 @@ default-package-overrides: - auto-update ==0.1.6 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.8 - - aws-xray-client ==0.1.0.0 - - aws-xray-client-wai ==0.1.0.0 + - aws-xray-client ==0.1.0.1 + - aws-xray-client-wai ==0.1.0.1 - backprop ==0.2.6.4 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 @@ -211,7 +211,7 @@ default-package-overrides: - base16 ==0.3.0.1 - base16-bytestring ==1.0.1.0 - base16-lens ==0.1.3.2 - - base32 ==0.2.0.0 + - base32 ==0.2.1.0 - base32-lens ==0.1.1.1 - base32string ==0.9.1 - base58-bytestring ==0.1.0 @@ -233,7 +233,7 @@ default-package-overrides: - bcp47 ==0.2.0.4 - bcp47-orphans ==0.1.0.4 - bcrypt ==0.0.11 - - bech32 ==1.1.0 + - bech32 ==1.1.1 - bech32-th ==1.0.2 - bench ==1.0.12 - benchpress ==0.2.2.17 @@ -304,7 +304,7 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.4 - - bugzilla-redhat ==0.3.1 + - bugzilla-redhat ==0.3.2 - burrito ==1.2.0.2 - butcher ==1.3.3.2 - buttplug-hs-core ==0.1.0.0 @@ -420,13 +420,13 @@ default-package-overrides: - Color ==0.3.2 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - - colour ==2.3.5 + - colour ==2.3.6 - combinatorial ==0.1.0.1 - comfort-array ==0.4.1 - comfort-graph ==0.0.3.1 - - commonmark ==0.2 + - commonmark ==0.2.1 - commonmark-extensions ==0.2.1.2 - - commonmark-pandoc ==0.2.1 + - commonmark-pandoc ==0.2.1.1 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -490,7 +490,7 @@ default-package-overrides: - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.9.0 - - criterion-measurement ==0.1.2.0 + - criterion-measurement ==0.1.3.0 - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 @@ -555,7 +555,7 @@ default-package-overrides: - data-hash ==0.2.0.1 - data-interval ==2.1.0 - data-inttrie ==0.1.4 - - data-lens-light ==0.1.2.2 + - data-lens-light ==0.1.2.3 - data-memocombinators ==0.5.1 - data-msgpack ==0.0.13 - data-msgpack-types ==0.0.3 @@ -680,7 +680,7 @@ default-package-overrides: - elynx-seq ==0.5.1.1 - elynx-tools ==0.5.1.1 - elynx-tree ==0.5.1.1 - - email-validate ==2.3.2.13 + - email-validate ==2.3.2.15 - emd ==0.2.0.0 - emojis ==0.1 - enclosed-exceptions ==1.0.3 @@ -703,7 +703,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.0.0 + - esqueleto ==3.5.2.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -729,7 +729,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.14 + - express ==0.1.16 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -803,7 +803,7 @@ default-package-overrides: - forkable-monad ==0.2.0.3 - forma ==1.1.3 - format-numbers ==0.1.0.1 - - formatting ==7.1.2 + - formatting ==7.1.3 - foundation ==0.0.26.1 - fourmolu ==0.3.0.0 - free ==5.1.7 @@ -850,8 +850,8 @@ default-package-overrides: - generics-eot ==0.4.0.1 - generics-sop ==0.5.1.1 - generics-sop-lens ==0.2.0.1 - - geniplate-mirror ==0.7.7 - - genvalidity ==0.11.0.0 + - geniplate-mirror ==0.7.8 + - genvalidity ==0.11.0.2 - genvalidity-aeson ==0.3.0.0 - genvalidity-bytestring ==0.6.0.0 - genvalidity-containers ==0.9.0.0 @@ -898,11 +898,11 @@ default-package-overrides: - ghc-prof ==1.4.1.8 - ghc-source-gen ==0.4.0.0 - ghc-syntax-highlighter ==0.0.6.0 - - ghc-tcplugins-extra ==0.4.1 - - ghc-trace-events ==0.1.2.2 - - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.5 - - ghc-typelits-natnormalise ==0.7.4 + - ghc-tcplugins-extra ==0.4.2 + - ghc-trace-events ==0.1.2.3 + - ghc-typelits-extra ==0.4.3 + - ghc-typelits-knownnat ==0.7.6 + - ghc-typelits-natnormalise ==0.7.6 - ghc-typelits-presburger ==0.6.0.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.23 @@ -923,7 +923,7 @@ default-package-overrides: - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.24 - - githash ==0.1.6.0 + - githash ==0.1.6.1 - github-release ==1.3.7 - github-rest ==1.0.3 - github-types ==0.2.1 @@ -974,7 +974,7 @@ default-package-overrides: - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.2.0 - - happstack-server ==7.7.1 + - happstack-server ==7.7.1.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 - HasBigDecimal ==0.1.1 @@ -1006,7 +1006,7 @@ default-package-overrides: - hasql-optparse-applicative ==0.3.0.6 - hasql-pool ==0.5.2 - hasql-queue ==1.2.0.2 - - hasql-transaction ==1.0.0.2 + - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - HaXml ==1.25.5 @@ -1015,7 +1015,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.4.1.0 + - headroom ==0.4.2.0 - heap ==1.0.4 - heaps ==0.4 - hebrew-time ==0.1.2 @@ -1025,7 +1025,7 @@ default-package-overrides: - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.14.4 - - hedn ==0.3.0.2 + - hedn ==0.3.0.3 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.4 @@ -1163,7 +1163,7 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.0.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.7.2 + - http-streams ==0.8.8.1 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 @@ -1212,7 +1212,7 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyper ==0.2.1.1 - hyperloglog ==0.4.4 - - hyphenation ==0.8.1 + - hyphenation ==0.8.2 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 @@ -1240,7 +1240,7 @@ default-package-overrides: - influxdb ==1.9.1.2 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.4 + - inline-c ==0.9.1.5 - inline-c-cpp ==0.4.0.3 - inline-r ==0.10.4 - inliterate ==0.1.0 @@ -1394,7 +1394,7 @@ default-package-overrides: - lift-generics ==0.2 - lift-type ==0.1.0.1 - line ==4.0.1 - - linear ==1.21.5 + - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 @@ -1606,7 +1606,7 @@ default-package-overrides: - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - net-mqtt ==0.7.1.1 - - net-mqtt-lens ==0.1.0.0 + - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1646,7 +1646,7 @@ default-package-overrides: - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.0.3 + - nri-observability ==0.1.1.1 - nri-prelude ==0.6.0.2 - nsis ==0.3.3 - numbers ==3000.2.0.2 @@ -1673,7 +1673,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.7.1.0 + - opaleye ==0.7.3.0 - OpenAL ==1.7.0.5 - openapi3 ==3.1.0 - open-browser ==0.2.1.0 @@ -1698,7 +1698,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.16.1.0 - optparse-generic ==1.4.4 - - optparse-simple ==0.1.1.3 + - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - ormolu ==0.1.4.1 @@ -1708,12 +1708,12 @@ default-package-overrides: - pager ==0.1.1.0 - pagination ==0.2.2 - pagure-cli ==0.2 - - pandoc ==2.14.0.2 + - pandoc ==2.14.0.3 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-plot ==1.2.3 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - - pantry ==0.5.2.2 + - pantry ==0.5.2.3 - parallel ==3.2.2.0 - parameterized ==0.5.0.0 - paripari ==0.7.0.0 @@ -1758,11 +1758,11 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.13.0.2 + - persistent ==2.13.1.1 - persistent-mtl ==0.2.2.0 - persistent-mysql ==2.13.0.1 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.0.2 + - persistent-postgresql ==2.13.0.3 - persistent-qq ==2.12.0.1 - persistent-sqlite ==2.13.0.3 - persistent-template ==2.12.0.0 @@ -1770,7 +1770,7 @@ default-package-overrides: - persistent-typed-db ==0.1.0.4 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.3.1.1 + - pg-transact ==0.3.2.0 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 @@ -2083,7 +2083,7 @@ default-package-overrides: - sequenceTools ==1.5.0 - serf ==0.1.1.0 - serialise ==0.2.3.0 - - servant ==0.18.2 + - servant ==0.18.3 - servant-auth ==0.4.0.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 @@ -2091,23 +2091,23 @@ default-package-overrides: - servant-auth-swagger ==0.2.10.1 - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 - - servant-client ==0.18.2 - - servant-client-core ==0.18.2 + - servant-client ==0.18.3 + - servant-client-core ==0.18.3 - servant-conduit ==0.15.1 - - servant-docs ==0.11.8 + - servant-docs ==0.11.9 - servant-elm ==0.7.2 - servant-errors ==0.1.6.0 - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - - servant-foreign ==0.15.3 - - servant-http-streams ==0.18.2 + - servant-foreign ==0.15.4 + - servant-http-streams ==0.18.3 - servant-machines ==0.15.1 - servant-multipart ==0.12.1 - servant-multipart-api ==0.12.1 - servant-openapi3 ==2.0.1.2 - - servant-pipes ==0.15.2 + - servant-pipes ==0.15.3 - servant-rawm ==1.0.0.0 - - servant-server ==0.18.2 + - servant-server ==0.18.3 - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.5.3.47.1 - servant-swagger-ui-core ==0.3.5 @@ -2118,9 +2118,9 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.0 + - sexp-grammar ==2.3.1 - SHA ==1.6.4.4 - - shake ==0.19.4 + - shake ==0.19.5 - shake-language-c ==0.12.0 - shake-plus ==0.3.3.1 - shake-plus-extended ==0.4.1.0 @@ -2143,7 +2143,7 @@ default-package-overrides: - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - simple-cmd ==0.2.3 - - simple-cmd-args ==0.1.6 + - simple-cmd-args ==0.1.7 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 @@ -2161,8 +2161,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.5.1 - - skylighting-core ==0.10.5.1 + - skylighting ==0.10.5.2 + - skylighting-core ==0.10.5.2 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slick ==1.1.1.0 @@ -2244,7 +2244,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.3.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.0 + - streaming-bytestring ==0.2.1 - streaming-commons ==0.2.2.1 - streamly ==0.7.3 - streams ==3.3 @@ -2264,7 +2264,7 @@ default-package-overrides: - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.8 + - stripe-concepts ==1.0.3 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 @@ -2329,7 +2329,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 - - tasty-silver ==3.2.1 + - tasty-silver ==3.2.2 - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 @@ -2338,7 +2338,7 @@ default-package-overrides: - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1.1 - - template-haskell-compat-v0208 ==0.1.5 + - template-haskell-compat-v0208 ==0.1.6 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2408,7 +2408,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.5 + - tidal ==1.7.7 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2443,7 +2443,7 @@ default-package-overrides: - transformers-bifunctors ==0.1 - transformers-compat ==0.6.6 - transformers-fix ==1.0 - - traverse-with-class ==1.0.1.0 + - traverse-with-class ==1.0.1.1 - tree-diff ==0.2 - tree-fun ==0.8.1.0 - tree-view ==0.5.1 @@ -2451,7 +2451,7 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - - ttc ==1.1.0.0 + - ttc ==1.1.0.1 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 @@ -2502,7 +2502,7 @@ default-package-overrides: - unipatterns ==0.0.0.0 - uniplate ==1.6.13 - uniprot-kb ==0.1.2.0 - - uniq-deep ==1.2.0 + - uniq-deep ==1.2.1 - unique ==0.0.1 - unique-logic ==0.4 - unique-logic-tf ==0.5.1 @@ -2527,7 +2527,7 @@ default-package-overrides: - unordered-containers ==0.2.14.0 - unsafe ==0.0 - urbit-hob ==0.3.3 - - uri-bytestring ==0.3.3.0 + - uri-bytestring ==0.3.3.1 - uri-bytestring-aeson ==0.1.0.8 - uri-encode ==1.5.0.7 - url ==2.1.3 @@ -2541,7 +2541,7 @@ default-package-overrides: - uuid-types ==1.0.5 - validation ==1.1.1 - validation-selective ==0.1.0.1 - - validity ==0.11.0.0 + - validity ==0.11.0.1 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - validity-containers ==0.5.0.4 @@ -2568,7 +2568,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.3.1 + - vector-sized ==1.4.4 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.9 @@ -2604,7 +2604,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.16 + - warp ==3.3.17 - warp-tls ==3.3.1 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2658,7 +2658,7 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - xeno ==0.4.2 - - xlsx ==0.8.3 + - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 - xml-basic ==0.1.3.1 @@ -2681,12 +2681,12 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.2.0.0 - - yesod ==1.6.1.1 + - yesod ==1.6.1.2 - yesod-auth ==1.6.10.3 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.20.1 + - yesod-core ==1.6.20.2 - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 6ecf31c7da7..e8e415695cf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -480,6 +480,7 @@ dont-distribute-packages: - avers-api - avers-api-docs - avers-server + - aviation-navigation - avro-piper - awesomium - awesomium-glut @@ -808,7 +809,6 @@ dont-distribute-packages: - convertible-text - coordinate - copilot - - copilot-c99 - copilot-cbmc - copilot-language - copilot-libraries @@ -1444,6 +1444,7 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options + - hasql-queue - hasql-th - hastache-aeson - haste-app @@ -1833,6 +1834,11 @@ dont-distribute-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-posture + - keid-core + - keid-geometry + - keid-render-basic + - keid-resource-gltf + - keid-ui-dearimgui - kevin - keysafe - keyvaluehash @@ -2334,6 +2340,7 @@ dont-distribute-packages: - polysemy-fs - polysemy-fskvstore - polysemy-http + - polysemy-keyed-state - polysemy-kvstore-jsonfile - polysemy-log - polysemy-log-co @@ -2886,6 +2893,7 @@ dont-distribute-packages: - swearjure - sweet-egison - switch + - sydtest-persistent-postgresql - sylvia - sym-plot - symantic-atom diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index facd3ec5a3d..ef0bd0656ff 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -914,4 +914,9 @@ self: super: builtins.intersectAttrs super { cachix = generateOptparseApplicativeCompletion "cachix" super.cachix; + # Enable extra optimisations which increase build time, but also + # later compiler performance, so we should do this for user's benefit. + # Flag added in Agda 2.6.2 + Agda = appendConfigureFlag super.Agda "-foptimise-heavily"; + } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 807d8a9bf0e..c895053704b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -784,40 +784,6 @@ self: { "Agda" = callPackage ({ mkDerivation, aeson, alex, array, async, base, binary - , blaze-html, boxes, bytestring, Cabal, containers, data-hash - , deepseq, directory, edit-distance, emacs, equivalence, exceptions - , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable - , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process - , regex-tdfa, split, stm, strict, template-haskell, text, time - , transformers, unordered-containers, uri-encode, zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.6.1.3"; - sha256 = "1rx1r21kpgz27g2qn6fqgdpkl5b07c2fl86j3clylpp9rr0ch6xv"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory filepath process ]; - libraryHaskellDepends = [ - aeson array async base binary blaze-html boxes bytestring - containers data-hash deepseq directory edit-distance equivalence - exceptions filepath geniplate-mirror ghc-compact gitrev hashable - hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time transformers - unordered-containers uri-encode zlib - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base directory filepath process ]; - executableToolDepends = [ emacs ]; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ abbradar turion ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_6_2" = callPackage - ({ mkDerivation, aeson, alex, array, async, base, binary , blaze-html, boxes, bytestring, Cabal, case-insensitive , containers, data-hash, deepseq, directory, edit-distance, emacs , equivalence, exceptions, filepath, ghc-compact, gitrev, happy @@ -11889,8 +11855,8 @@ self: { ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "Kawaii-Parser"; - version = "0.0.0"; - sha256 = "163rh1vciljl35wc5wrcr1ky2vb536pv6hhnl3r97mfjc9c9k2wm"; + version = "1.0.1"; + sha256 = "032kglqc4pfhig7wqqsps0g490ajp1yffl4h4lr3qs98vi7vl4x6"; libraryHaskellDepends = [ base containers mtl ]; description = "A simple parsing library"; license = lib.licenses.bsd3; @@ -25543,6 +25509,8 @@ self: { testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "agda2lagda" = callPackage @@ -35998,6 +35966,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "aviation-navigation" = callPackage + ({ mkDerivation, base, lens, mtl, optparse-applicative, radian }: + mkDerivation { + pname = "aviation-navigation"; + version = "0.1.0.0"; + sha256 = "17nb2ryrxdy3sv68cnbv7saw5k9wh9nyas74bpsyn0p8grw71sd5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lens mtl optparse-applicative radian + ]; + executableHaskellDepends = [ + base lens mtl optparse-applicative radian + ]; + description = "Aviation Navigation functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aviation-units" = callPackage ({ mkDerivation, base, lens }: mkDerivation { @@ -36956,28 +36943,6 @@ self: { }: mkDerivation { pname = "aws-xray-client"; - version = "0.1.0.0"; - sha256 = "0rb46hz2y9mz0prgyb5m2v31j05cx18j6yl01pawhrb6v8pb7z00"; - libraryHaskellDepends = [ - aeson base bytestring deepseq http-types lens network random text - time - ]; - testHaskellDepends = [ - aeson aeson-qq base generic-arbitrary hspec lens QuickCheck random - text - ]; - benchmarkHaskellDepends = [ async base criterion random time ]; - description = "A client for AWS X-Ray"; - license = lib.licenses.mit; - }) {}; - - "aws-xray-client_0_1_0_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, async, base, bytestring - , criterion, deepseq, generic-arbitrary, hspec, http-types, lens - , network, QuickCheck, random, text, time - }: - mkDerivation { - pname = "aws-xray-client"; version = "0.1.0.1"; sha256 = "1b179i32aw3xi72vnxmgvgczq14ay159cji9mmk345shdiac6crj"; libraryHaskellDepends = [ @@ -36991,7 +36956,6 @@ self: { benchmarkHaskellDepends = [ async base criterion random time ]; description = "A client for AWS X-Ray"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "aws-xray-client-persistent" = callPackage @@ -37019,23 +36983,6 @@ self: { }: mkDerivation { pname = "aws-xray-client-wai"; - version = "0.1.0.0"; - sha256 = "1vrgx2l3f08bd73z0an15zh3fla0d5sxqvwbsk1jxkrjfy2c43rd"; - libraryHaskellDepends = [ - aws-xray-client base bytestring containers http-types lens random - text time unliftio unliftio-core vault wai - ]; - description = "A client for AWS X-Ray integration with WAI"; - license = lib.licenses.mit; - }) {}; - - "aws-xray-client-wai_0_1_0_1" = callPackage - ({ mkDerivation, aws-xray-client, base, bytestring, containers - , http-types, lens, random, text, time, unliftio, unliftio-core - , vault, wai - }: - mkDerivation { - pname = "aws-xray-client-wai"; version = "0.1.0.1"; sha256 = "0b2rnls3qk7qzn9swfqmslxrw466gs6lhh7zi677k5b0dzh237vp"; libraryHaskellDepends = [ @@ -37044,7 +36991,6 @@ self: { ]; description = "A client for AWS X-Ray integration with WAI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "axel" = callPackage @@ -38263,31 +38209,6 @@ self: { }: mkDerivation { pname = "base32"; - version = "0.2.0.0"; - sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; - revision = "2"; - editedCabalFile = "0chbgkq65mh6nc48a3hywcv7idfqgb3acv4b7gmz8m6szqq4mx95"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-byteorder text text-short - ]; - testHaskellDepends = [ - base bytestring memory QuickCheck random-bytestring tasty - tasty-hunit tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq memory random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base32 encoding"; - license = lib.licenses.bsd3; - }) {}; - - "base32_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq - , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty - , tasty-hunit, tasty-quickcheck, text, text-short - }: - mkDerivation { - pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; revision = "1"; @@ -38304,7 +38225,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base32 encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base32-bytestring" = callPackage @@ -39328,8 +39248,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.9.0.0"; - sha256 = "0ixaxjmgg162ff7srvwmkv5lp1kfb0b6wmrpaz97rsmlpa5vf6ji"; + version = "0.9.1.0"; + sha256 = "1rw3db9qmf08wi5gcd0cbsz5cpndf8cwkbzkh74gbwwpcpa7lg39"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -39352,8 +39272,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.0.0"; - sha256 = "0xrmb5nmn5ffzgcpsjilagz5ppm283kfjvvbnsvpvnh6p6i0xc99"; + version = "0.5.1.0"; + sha256 = "0wvbs7lda7pxsrymm2dv2km1w3snd8mjwijagn06ylrc2pjn6sjz"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -39405,17 +39325,18 @@ self: { , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific , tagged, tasty, tasty-hunit, text, time, tmp-postgres - , unordered-containers, uuid, uuid-types, vector + , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.0.0"; - sha256 = "03dd9qzw3b2rqva2pn4iaq5lswn8gb7lrlsa6nmc0bfn1w9i4a7k"; + version = "0.5.1.0"; + sha256 = "17npmh5agnxy12n93hrpi83al80csmvigbm3mlsvx92l4mcif2ml"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base monad-control mtl network-uri postgresql-libpq postgresql-simple - scientific tagged text time unordered-containers uuid-types vector + scientific tagged text time transformers-base unordered-containers + uuid-types vector ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog @@ -39428,17 +39349,19 @@ self: { "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate - , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, tasty, tasty-expected-failure, tasty-hunit, text - , time, unix + , bytestring, dlist, free, hashable, monad-control, mtl + , network-uri, scientific, sqlite-simple, tasty + , tasty-expected-failure, tasty-hunit, text, time + , transformers-base, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.5.0.0"; - sha256 = "1ng67jspdwp4prfzp9lzhl1g26q9bfpmxpwv0q392y8wwrq6zxrj"; + version = "0.5.1.0"; + sha256 = "1vfrma27rchq3p4h0p21m3lhz46yxyagbrb39r9jb8w20whja2gr"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free - hashable mtl network-uri scientific sqlite-simple text time unix + hashable monad-control mtl network-uri scientific sqlite-simple + text time transformers-base unix ]; testHaskellDepends = [ base beam-core beam-migrate sqlite-simple tasty @@ -39533,35 +39456,6 @@ self: { }: mkDerivation { pname = "bech32"; - version = "1.1.0"; - sha256 = "0s7kqy128k71rnpv22awf643djhsyd8ipihx38lvslsxk8klr8i0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers extra text - ]; - executableHaskellDepends = [ - base base58-bytestring bytestring extra memory optparse-applicative - text - ]; - testHaskellDepends = [ - base base58-bytestring bytestring containers deepseq extra hspec - memory process QuickCheck text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "bech32_1_1_1" = callPackage - ({ mkDerivation, array, base, base58-bytestring, bytestring - , containers, deepseq, extra, hspec, hspec-discover, memory - , optparse-applicative, process, QuickCheck, text, vector - }: - mkDerivation { - pname = "bech32"; version = "1.1.1"; sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; isLibrary = true; @@ -46766,26 +46660,6 @@ self: { "bugzilla-redhat" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, http-conduit, http-types, iso8601-time, resourcet - , text, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bugzilla-redhat"; - version = "0.3.1"; - sha256 = "088ya35lwxnvg0x996agy2ky8kp4r3j2i1ja15fy3afcqfpvbqiv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring connection containers - http-conduit http-types iso8601-time resourcet text time - transformers unordered-containers vector - ]; - description = "A Haskell interface to the Bugzilla native REST API"; - license = lib.licenses.bsd3; - }) {}; - - "bugzilla-redhat_0_3_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, hspec, http-conduit, http-types, iso8601-time , resourcet, text, time, transformers, unordered-containers, vector }: @@ -46803,7 +46677,6 @@ self: { testHaskellDepends = [ aeson base hspec time ]; description = "A Haskell interface to the Bugzilla native REST API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "build" = callPackage @@ -50557,8 +50430,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.0.1"; - sha256 = "1jwlkrf4aja71sbxxlxsd7syh6sb4vgv2pb18mvj5ppm6al2ykp3"; + version = "1.1.0"; + sha256 = "0y6ds8lhhs0r4ns35y6zrph3bjkq9kdx4zp7kb8knsn0cpd3haz1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54040,39 +53913,40 @@ self: { "chessIO" = callPackage ({ mkDerivation, attoparsec, base, binary, brick, bytestring , containers, deepseq, directory, extra, file-embed, filepath - , hashable, haskeline, lens, megaparsec, MonadRandom + , hashable, haskeline, HUnit, lens, megaparsec, MonadRandom , mono-traversable, mtl, o-clock, optparse-applicative, parallel , prettyprinter, process, random, rosezipper, stm, template-haskell - , text, th-lift-instances, time, unordered-containers, vector - , vector-binary-instances, vector-instances, vty + , text, th-compat, th-lift-instances, time, unordered-containers + , vector, vector-binary-instances, vector-instances, vty }: mkDerivation { pname = "chessIO"; - version = "0.7.0.0"; - sha256 = "1jb1c702c58g0pkk43g1mp7clm0wbkq993j880v3p7cxbyj5n9bh"; + version = "0.8.0.0"; + sha256 = "16xgq8xvfvk6rsjzaimd29b867ffml2h9nldsy5d5sninbmbq0k8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers deepseq extra file-embed hashable lens megaparsec MonadRandom mono-traversable o-clock prettyprinter process random stm template-haskell text - th-lift-instances unordered-containers vector + th-compat th-lift-instances unordered-containers vector vector-binary-instances vector-instances ]; executableHaskellDepends = [ attoparsec base binary brick bytestring containers deepseq extra file-embed filepath hashable haskeline lens megaparsec MonadRandom mono-traversable mtl o-clock optparse-applicative prettyprinter - process random rosezipper stm template-haskell text + process random rosezipper stm template-haskell text th-compat th-lift-instances time unordered-containers vector vector-binary-instances vector-instances vty ]; testHaskellDepends = [ attoparsec base binary bytestring containers deepseq directory - extra file-embed hashable lens megaparsec MonadRandom + extra file-embed hashable HUnit lens megaparsec MonadRandom mono-traversable o-clock parallel prettyprinter process random stm - template-haskell text th-lift-instances time unordered-containers - vector vector-binary-instances vector-instances + template-haskell text th-compat th-lift-instances time + unordered-containers vector vector-binary-instances + vector-instances ]; description = "Basic chess library"; license = lib.licenses.bsd3; @@ -56820,8 +56694,8 @@ self: { }: mkDerivation { pname = "closed-intervals"; - version = "0.1.0.1"; - sha256 = "19vmiwwzv9g4nl1mzkqc7r9bw67n9y7kk3v0jc2vc8yjzrmqgy7v"; + version = "0.1.1.0"; + sha256 = "0wmxacb9msr7bip5pz9qwgvg9kgvpyylps6xhsg85blhd2bplmbi"; libraryHaskellDepends = [ base containers time ]; testHaskellDepends = [ base containers doctest-exitcode-stdio doctest-lib QuickCheck time @@ -56829,6 +56703,8 @@ self: { ]; description = "Closed intervals of totally ordered types"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "closure" = callPackage @@ -58781,23 +58657,6 @@ self: { }: mkDerivation { pname = "colour"; - version = "2.3.5"; - sha256 = "1rq4l46jx4lpdppy71wf7m1n7pw2jwy788rm35ycwzb1g4clg39v"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base QuickCheck random test-framework test-framework-quickcheck2 - ]; - description = "A model for human colour/color perception"; - license = lib.licenses.mit; - }) {}; - - "colour_2_3_6" = callPackage - ({ mkDerivation, base, QuickCheck, random, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "colour"; version = "2.3.6"; sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; enableSeparateDataOutput = true; @@ -58807,7 +58666,6 @@ self: { ]; description = "A model for human colour/color perception"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "colour-accelerate" = callPackage @@ -59323,28 +59181,6 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2"; - sha256 = "083xrmyxsgn6ivrxqgmjbqvv4k64n7a330pbf1n7xbsjqh78cg28"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-transforms - }: - mkDerivation { - pname = "commonmark"; version = "0.2.1"; sha256 = "1vba7v1zaqh811v3j4x42g7mhwvxwgzm997kq1kzd0njby14fq5b"; libraryHaskellDepends = [ @@ -59358,7 +59194,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -59410,21 +59245,6 @@ self: { }: mkDerivation { pname = "commonmark-pandoc"; - version = "0.2.1"; - sha256 = "0i5qavci8j63d15i2c6cbm0b53kcjh7s4vxadfgf4vkp2sy1ybvw"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_1_1" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; version = "0.2.1.1"; sha256 = "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp"; libraryHaskellDepends = [ @@ -59432,7 +59252,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commsec" = callPackage @@ -63968,8 +63787,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.3"; - sha256 = "166nin0861i2ak06gdhj6sv6zv7cc60wmqgv4mly9hjf0qp3w6j1"; + version = "3.4"; + sha256 = "1cl7w9z08rnzsig09q65i6j4644zj469isd1mjjiwp23yiqs5gfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63982,26 +63801,20 @@ self: { }) {}; "copilot-c99" = callPackage - ({ mkDerivation, base, containers, copilot-core, copilot-language - , csv, directory, filepath, hspec, language-c99 - , language-c99-simple, language-c99-util, mtl, pretty, process - , QuickCheck + ({ mkDerivation, base, containers, copilot-core, directory + , filepath, language-c99, language-c99-simple, language-c99-util + , mtl, pretty }: mkDerivation { pname = "copilot-c99"; - version = "3.3"; - sha256 = "09qjfhf0dkccbi4kycwqavv7bxdpfj2j50vkljmzrxh59xq00jnz"; + version = "3.4"; + sha256 = "14ajk29p4da777r9klfqhcyi5qkrz16qn5f6h22kgw1vqj9vm4ja"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty ]; - testHaskellDepends = [ - base copilot-core copilot-language csv hspec language-c99 - language-c99-simple pretty process QuickCheck - ]; description = "A compiler for Copilot targeting C99"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "copilot-cbmc" = callPackage @@ -64025,8 +63838,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.3"; - sha256 = "19k206hsqd3lw2k40cjpjhnwfjsfraagw622bxn97rk4195jqhy6"; + version = "3.4"; + sha256 = "01bxajyxd9na6msjnh6klnhc71xryc7nxz96pylyqn39978by7p0"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; @@ -64038,8 +63851,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.3"; - sha256 = "1x39jyn82j9mydsbi8n24a2nx8j00gcxw2rsxqagjpwqx10igyr2"; + version = "3.4"; + sha256 = "0i3ha9mpjizqalhnv2vvcgzs75r3ld7c4qhaknip3jw1d0j76fx6"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -64055,8 +63868,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.3"; - sha256 = "0f8g67j26g1k5xph6zg5crypj0ys8mf0i5pazn04sy02lslsdmd9"; + version = "3.4"; + sha256 = "13ypvpqr0g3xrvdria35c83yxpk3727wm6n8jdsihq7ilkhl00mf"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -64090,8 +63903,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.3"; - sha256 = "1js4j9alfnlxi6zsvcdj8zf2r04lm9rp22r6zq6qkhams6pmmxly"; + version = "3.4"; + sha256 = "1mrw6i4dwg8cx56821vcy0bnzyhxcch0k9byrkazg3jgplvalfbr"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65745,8 +65558,8 @@ self: { }: mkDerivation { pname = "criterion-measurement"; - version = "0.1.2.0"; - sha256 = "03p71mfnnfjx9dnf0yhrhdcr30zc2nwn5f8lql48cabccpd3793l"; + version = "0.1.3.0"; + sha256 = "1ffmjcpmdx2sx0sr3g5n2s8dhrbmh7606zfnymv2v9h1rf36xf3x"; libraryHaskellDepends = [ aeson base base-compat binary containers deepseq vector ]; @@ -67130,23 +66943,24 @@ self: { ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , conduit, conduit-extra, containers, data-default, directory , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl - , primitive, resourcet, semigroups, test-framework - , test-framework-hunit, text, transformers, unordered-containers - , vector + , ordered-containers, primitive, resourcet, semigroups + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.7.2.0"; - sha256 = "1bclavsan00mv0n0dy0ap6byk4w5fwnhpvxhdhx94r7bxfqi2r0q"; + version = "0.7.3.0"; + sha256 = "1xh11h4qibjcv8b0rk5mwdzww183kpjqzl3x22rbfryjvrp0n07w"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ghc-prim mmorph - monad-control mtl primitive resourcet semigroups text transformers - unordered-containers vector + monad-control mtl ordered-containers primitive resourcet semigroups + text transformers unordered-containers vector ]; testHaskellDepends = [ - base bytestring containers directory HUnit mtl primitive - test-framework test-framework-hunit text transformers vector + base bytestring conduit containers directory HUnit mtl + ordered-containers primitive test-framework test-framework-hunit + text transformers vector ]; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = lib.licenses.bsd3; @@ -67444,8 +67258,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.10.2.0"; - sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l"; + version = "0.11.0.0"; + sha256 = "0j35p4i611jkxa3i59gvc7vgbkzx7ckri1fd1n0ryv8akn4gl9m8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68187,6 +68001,19 @@ self: { license = lib.licenses.mit; }) {}; + "d10_0_3_0_1" = callPackage + ({ mkDerivation, base, hedgehog, template-haskell }: + mkDerivation { + pname = "d10"; + version = "0.3.0.1"; + sha256 = "0fw6hl0ikfxgqhns18f0h3hs2ihi2d09jpjvmgrzddf3d8lrrlnh"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hedgehog template-haskell ]; + description = "Digits 0-9"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "d3d11binding" = callPackage ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler , d3dx11, d3dxof, dxgi, dxguid, vect, Win32 @@ -69872,23 +69699,11 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "data-lens-light"; - version = "0.1.2.2"; - sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj"; - libraryHaskellDepends = [ base mtl template-haskell ]; - description = "Simple lenses, minimum dependencies"; - license = lib.licenses.mit; - }) {}; - - "data-lens-light_0_1_2_3" = callPackage - ({ mkDerivation, base, mtl, template-haskell }: - mkDerivation { - pname = "data-lens-light"; version = "0.1.2.3"; sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Simple lenses, minimum dependencies"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "data-lens-template" = callPackage @@ -78984,6 +78799,8 @@ self: { testHaskellDepends = [ base containers hspec lens mtl random ]; description = "A simulator for the board game Dominion"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "domplate" = callPackage @@ -83723,8 +83540,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.13"; - sha256 = "0wh955b9wwqwl8jbkzyxxaf8q9y80dbh0f6vaxxzh2cc7zqc31im"; + version = "2.3.2.15"; + sha256 = "0n67wss6k8lhwfkybkhsa04bbdfdv541sacbxlylkx2hqpj5r5gh"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -83733,23 +83550,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "email-validate_2_3_2_14" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.14"; - sha256 = "1jl93c5xm20gpngqxgzbcaqhkjl9nxsph17qgzyd2whmkz5yxhk7"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -85654,34 +85454,6 @@ self: { "esqueleto" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, postgresql-libpq, postgresql-simple, resourcet - , tagged, text, time, transformers, unliftio, unordered-containers - , vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.0.0"; - sha256 = "00mamdsm4yc8gdvb5zfnhnp7iqkg7h9fd5jgzrbdh9q7isyc6kiy"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - postgresql-libpq postgresql-simple resourcet tagged text time - transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql , persistent-postgresql, persistent-sqlite, postgresql-simple @@ -85706,7 +85478,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ess" = callPackage @@ -88007,13 +87778,27 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.14"; - sha256 = "19sjh12sjpxhk7wg2b3abga7bpk6ckry19zi58imqmy8xbh6ds39"; + version = "0.1.16"; + sha256 = "04a1iv3dzyni7b0yvzqf1s8l0wg07hk9sg6d59hdbsl4f3kw8ki4"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving function application and variables"; + license = lib.licenses.bsd3; + }) {}; + + "express_1_0_0" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "1.0.0"; + sha256 = "1aymnlq1nkw7qvrydmy0447ls5lnnjkhvpgicr56p2v65xrd37qx"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; - description = "Dynamically-typed expressions involving applications and variables"; + description = "Dynamically-typed expressions involving function application and variables"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "expression-parser" = callPackage @@ -93979,6 +93764,29 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "foldl_1_4_12" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, primitive + , profunctors, random, semigroupoids, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "foldl"; + version = "1.4.12"; + sha256 = "0zf4yljh3s2ddxa7dhzdglmylj14kfldhkclc44g37zvjq6kcnag"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable primitive + profunctors random semigroupoids text transformers + unordered-containers vector + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, doctest, foldl, safe-exceptions }: mkDerivation { @@ -94640,27 +94448,6 @@ self: { }: mkDerivation { pname = "formatting"; - version = "7.1.2"; - sha256 = "13sdc3wc8ahf18g5yld9bqi5yhbbg1w1r69rims93c5bxhiw3f9f"; - libraryHaskellDepends = [ - base clock double-conversion ghc-prim old-locale scientific text - time transformers - ]; - testHaskellDepends = [ base ghc-prim hspec scientific text ]; - benchmarkHaskellDepends = [ - base criterion ghc-prim QuickCheck text - ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = lib.licenses.bsd3; - }) {}; - - "formatting_7_1_3" = callPackage - ({ mkDerivation, base, clock, criterion, double-conversion - , ghc-prim, hspec, old-locale, QuickCheck, scientific, text, time - , transformers - }: - mkDerivation { - pname = "formatting"; version = "7.1.3"; sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0"; libraryHaskellDepends = [ @@ -94673,7 +94460,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "forml" = callPackage @@ -97582,30 +97368,30 @@ self: { ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed - , filepath, free, gitrev, happy, hashable, haskeline - , language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , filepath, free, futhark-data, futhark-server, gitrev, happy + , hashable, haskeline, language-c-quote, mainland-pretty + , megaparsec, mtl, neat-interpolation, parallel, parser-combinators + , pcg-random, process, process-extras, QuickCheck, regex-tdfa + , srcloc, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, terminal-size, text, time, transformers + , unordered-containers, utf8-string, vector + , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.19.6"; - sha256 = "1wpg2ad2xv60xsdvnq3246nps3ldc00n58k7jxmh8lrx5bjzg263"; + version = "0.19.7"; + sha256 = "1c3la98gsw3xxvakg4zsknwn3z3whn75r5vr9rf6w6f48jl0829k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bmp bytestring bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free gitrev hashable haskeline - language-c-quote mainland-pretty megaparsec mtl neat-interpolation - parallel pcg-random process process-extras regex-tdfa srcloc - template-haskell temporary terminal-size text time transformers - unordered-containers utf8-string vector vector-binary-instances - versions zip-archive zlib + dlist file-embed filepath free futhark-data futhark-server gitrev + hashable haskeline language-c-quote mainland-pretty megaparsec mtl + neat-interpolation parallel pcg-random process process-extras + regex-tdfa srcloc template-haskell temporary terminal-size text + time transformers unordered-containers utf8-string vector + vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; @@ -99154,6 +98940,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.12"; sha256 = "17br2dl9gd2hyflgp0fzqs5ghp4my4l234pjfvvnhk9n4szxzcr3"; + revision = "1"; + editedCabalFile = "0nd40p8iqr6bk7py9rblpis2s8i4p5wgg6kfp607mpp4y17xq1dr"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -99173,6 +98961,18 @@ self: { license = lib.licenses.mit; }) {}; + "generic-arbitrary_0_2_0" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.2.0"; + sha256 = "1wlrsj9l57vqdkaablb8ypq2g1i4mishjag00fyf2imr2cvzkamg"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -99919,23 +99719,11 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.7"; - sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b"; - libraryHaskellDepends = [ base mtl template-haskell ]; - description = "Use Template Haskell to generate Uniplate-like functions"; - license = lib.licenses.bsd3; - }) {}; - - "geniplate-mirror_0_7_8" = callPackage - ({ mkDerivation, base, mtl, template-haskell }: - mkDerivation { - pname = "geniplate-mirror"; version = "0.7.8"; sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "geniserver" = callPackage @@ -99993,27 +99781,12 @@ self: { }: mkDerivation { pname = "genvalidity"; - version = "0.11.0.0"; - sha256 = "0kqhmgq7p94980br47jd6k9m2vjb62idx8x5hrcmybf0dakyscbl"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = lib.licenses.mit; - }) {}; - - "genvalidity_0_11_0_2" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; version = "0.11.0.2"; sha256 = "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j"; libraryHaskellDepends = [ base QuickCheck random validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -102300,23 +102073,11 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.1"; - sha256 = "0v9y444gydfyk56y7adpabd633yv1d8jmddvgg272n8jpdpagw67"; - libraryHaskellDepends = [ base ghc ]; - description = "Utilities for writing GHC type-checker plugins"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-tcplugins-extra_0_4_2" = callPackage - ({ mkDerivation, base, ghc }: - mkDerivation { - pname = "ghc-tcplugins-extra"; version = "0.4.2"; sha256 = "1gddqcczb8ixmrlfbfb06dc470jsjhvsxx3q2nsd4mcx2x6jdk08"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-time-alloc-prof" = callPackage @@ -102355,25 +102116,12 @@ self: { ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.2.2"; - sha256 = "18vhv99lrfjx6bxww77qxg7gwqmvpylvlrq1bji0hd6mcxxdjn69"; - libraryHaskellDepends = [ base bytestring text ]; - benchmarkHaskellDepends = [ base bytestring tasty-bench ]; - description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-trace-events_0_1_2_3" = callPackage - ({ mkDerivation, base, bytestring, tasty-bench, text }: - mkDerivation { - pname = "ghc-trace-events"; version = "0.1.2.3"; sha256 = "11m2ihzlncvxp8x2zgbnzbyybz2lbpdl5flk4gzmq0qz0957j7qd"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage @@ -102384,29 +102132,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.2"; - sha256 = "0xpy52rib25iz5h89nqlj27isjk57pjbhlvlfam5q0g3x92572h4"; - libraryHaskellDepends = [ - base containers ghc ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp - transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_4_3" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-prim - , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; version = "0.4.3"; sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; libraryHaskellDepends = [ @@ -102420,7 +102145,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -102430,26 +102154,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.5"; - sha256 = "1xraiil3nq02jdb4blkmsrdp36qhykv2xvwg3kaiyw5bgfl15gl3"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_7_6" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; version = "0.7.6"; sha256 = "10m4y0hf25w2i40464pz85lqs5dr8cznl191icnibc5fjynyzd9v"; libraryHaskellDepends = [ @@ -102461,7 +102165,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -102470,22 +102173,6 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.4"; - sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_7_6" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra - , integer-gmp, tasty, tasty-hunit, template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; version = "0.7.6"; sha256 = "09d70iw58m5g6yi8k2b52f1g0pfdqm5fzhs8rd7fgrgmi70np9bx"; libraryHaskellDepends = [ @@ -102494,7 +102181,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -103136,6 +102822,8 @@ self: { pname = "ghcup"; version = "0.1.14.2"; sha256 = "1k18ira2i2ja4hd65fdxk3ab21xzh4fvd982q2rfjshzkds1a3hv"; + revision = "1"; + editedCabalFile = "1vy71ly44jibq8bil0ns80m2zn9gcpnz8f9w2mn4j404gajpqagk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105162,25 +104850,6 @@ self: { "githash" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , process, template-haskell, temporary, unliftio - }: - mkDerivation { - pname = "githash"; - version = "0.1.6.0"; - sha256 = "1mcfzgvqiirlz8vc02wlvvfyf6742f3901ks8rphhabl4b4v1djl"; - libraryHaskellDepends = [ - base bytestring directory filepath process template-haskell - ]; - testHaskellDepends = [ - base bytestring directory filepath hspec process template-haskell - temporary unliftio - ]; - description = "Compile git revision info into Haskell projects"; - license = lib.licenses.bsd3; - }) {}; - - "githash_0_1_6_1" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec , process, template-haskell, temporary, th-compat, unliftio }: mkDerivation { @@ -105197,7 +104866,6 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "github" = callPackage @@ -106237,8 +105905,8 @@ self: { pname = "glirc"; version = "2.38"; sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; - revision = "1"; - editedCabalFile = "04f35w57jq6gpi6d3d83c9bswwl724rbd0dbl835ilhl18kpfscj"; + revision = "2"; + editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -110954,21 +110622,20 @@ self: { ({ mkDerivation, aeson, base, conduit, containers, exceptions , hspec, hspec-expectations, hspec-megaparsec, megaparsec , parser-combinators, QuickCheck, raw-strings-qq, scientific, text - , transformers, unordered-containers + , transformers, unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "0.11.1.0"; - sha256 = "093gk2w2qrvarcv7xn0d0saa1j35cy0isw5vz04h08gy37s2nspc"; + version = "1.0.0.0"; + sha256 = "09r2a444l18pzy0952hkpl98vkmldi8j94hr6qf16xg5y9nic3nd"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ - aeson base conduit containers exceptions hspec hspec-expectations - hspec-megaparsec megaparsec parser-combinators QuickCheck - raw-strings-qq scientific text transformers unordered-containers + aeson base conduit exceptions hspec hspec-megaparsec megaparsec + QuickCheck raw-strings-qq scientific text unordered-containers ]; description = "Haskell GraphQL implementation"; license = "MPL-2.0 AND BSD-3-Clause"; @@ -115375,6 +115042,8 @@ self: { ]; description = "Wrapper to integrate literate Agda files with Hakyll"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-alectryon" = callPackage @@ -117124,34 +116793,6 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-bsd, network-uri, old-locale, parsec, process, semigroups - , sendfile, syb, system-filepath, text, threads, time, transformers - , transformers-base, transformers-compat, unix, utf8-string, xhtml - , zlib - }: - mkDerivation { - pname = "happstack-server"; - version = "7.7.1"; - sha256 = "1zxdv7nihw3kjq2fvw5cl3s27pwm5gkli3sl15iqxfm7mdxz8rm0"; - libraryHaskellDepends = [ - base base64-bytestring blaze-html bytestring containers directory - exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-bsd network-uri old-locale parsec - process semigroups sendfile syb system-filepath text threads time - transformers transformers-base transformers-compat unix utf8-string - xhtml zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit parsec zlib - ]; - description = "Web related tools and services"; - license = lib.licenses.bsd3; - }) {}; - - "happstack-server_7_7_1_1" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring - , containers, directory, exceptions, extensible-exceptions - , filepath, hslogger, html, HUnit, monad-control, mtl, network , network-uri, old-locale, parsec, process, semigroups, sendfile , syb, system-filepath, text, threads, time, transformers , transformers-base, transformers-compat, unix, utf8-string, xhtml @@ -117174,7 +116815,6 @@ self: { ]; description = "Web related tools and services"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "happstack-server-tls" = callPackage @@ -117742,6 +117382,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasbolt_0_1_6_1" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , connection, containers, criterion, data-binary-ieee754 + , data-default, deepseq, deepseq-generics, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.6.1"; + sha256 = "1skniw27z4p3103anh2jc546h0jkvsacsnwnf32zz7a4paw6z280"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default deepseq deepseq-generics mtl network text + ]; + testHaskellDepends = [ + base binary bytestring containers hspec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base base64-bytestring binary bytestring criterion data-default + hspec + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -122780,6 +122446,7 @@ self: { ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-simple" = callPackage @@ -122807,8 +122474,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.8"; - sha256 = "14h71s7dha1g0zfi3vsg5y6lsn09x8c9nqv1nqiqmw2m19adx7gi"; + version = "0.4.0.9"; + sha256 = "0z3falhkyyqpzqh116xwzvjj0xb391bwahh64sasnw4vf2i0drb9"; libraryHaskellDepends = [ base bytestring containers contravariant foldl hasql postgresql-syntax template-haskell template-haskell-compat-v0208 @@ -122826,8 +122493,8 @@ self: { }: mkDerivation { pname = "hasql-transaction"; - version = "1.0.0.2"; - sha256 = "1ig6fny9c90cmfsh6kcdhj9ps2arn1y80ic2w7ps6mn8wgl0cr82"; + version = "1.0.1"; + sha256 = "1a83x2jrv9bhjrxfgvqfwrqv5cx1f401rmvz0k44yww5p816jk9s"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder contravariant contravariant-extras hasql mtl transformers @@ -124625,8 +124292,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.2"; - sha256 = "1s2alhwmkk5czilm1m2dp72xpbdjhn7yhghrs1aca2js71x5j7qj"; + version = "0.2.0.1"; + sha256 = "1bkjk5bzlzsigqdcb3vyqmjxddf4hm7b5a4ppb0iwh5n78whxpjc"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -124656,33 +124323,6 @@ self: { }) {}; "headroom" = callPackage - ({ mkDerivation, aeson, base, doctest, either, file-embed - , generic-data, hspec, hspec-discover, microlens, microlens-th, mtl - , mustache, optparse-applicative, pcre-heavy, pcre-light - , QuickCheck, rio, string-interpolate, template-haskell, time, yaml - }: - mkDerivation { - pname = "headroom"; - version = "0.4.1.0"; - sha256 = "1f98x1qm567wsa58nyavj7lfi2fmm6zrmjc0cwg0dyhvi63n9qp0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base either file-embed generic-data microlens microlens-th - mtl mustache optparse-applicative pcre-heavy pcre-light rio - string-interpolate template-haskell time yaml - ]; - executableHaskellDepends = [ base optparse-applicative rio ]; - testHaskellDepends = [ - aeson base doctest hspec mtl optparse-applicative pcre-light - QuickCheck rio string-interpolate time - ]; - testToolDepends = [ hspec-discover ]; - description = "License Header Manager"; - license = lib.licenses.bsd3; - }) {}; - - "headroom_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, doctest, either, extra, file-embed , generic-data, hspec, hspec-discover, http-client, http-types , microlens, microlens-th, modern-uri, mtl, mustache @@ -124709,7 +124349,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "License Header Manager"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "heap" = callPackage @@ -125409,27 +125048,6 @@ self: { }: mkDerivation { pname = "hedn"; - version = "0.3.0.2"; - sha256 = "1w9p9h06rgz80153b2q59bblpn124nicn1sscyyjc1cfwda2h0b4"; - libraryHaskellDepends = [ - base containers deepseq deriving-compat megaparsec - parser-combinators prettyprinter scientific template-haskell text - time uuid-types vector - ]; - testHaskellDepends = [ - base containers hedgehog megaparsec text time uuid-types vector - ]; - description = "EDN parsing and encoding"; - license = lib.licenses.bsd3; - }) {}; - - "hedn_0_3_0_3" = callPackage - ({ mkDerivation, base, containers, deepseq, deriving-compat - , hedgehog, megaparsec, parser-combinators, prettyprinter - , scientific, template-haskell, text, time, uuid-types, vector - }: - mkDerivation { - pname = "hedn"; version = "0.3.0.3"; sha256 = "0amfsmnly9yxzv1j34ya8kq9fqd067kgklx7rswy5g7aflj3bpwl"; libraryHaskellDepends = [ @@ -125442,7 +125060,6 @@ self: { ]; description = "EDN parsing and encoding"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedn-functor" = callPackage @@ -129943,6 +129560,51 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger_1_22" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries + , bytestring, cmdargs, containers, data-default, Decimal, Diff + , directory, extra, filepath, githash, hashable, haskeline + , hledger-lib, lucid, math-functions, megaparsec, mtl, old-time + , process, regex-tdfa, safe, shakespeare, split, tabular, tasty + , temporary, terminfo, text, time, timeit, transformers + , unordered-containers, utf8-string, utility-ht, wizards + }: + mkDerivation { + pname = "hledger"; + version = "1.22"; + sha256 = "1w7akdl9pn77s3fnb5wq3f7k2xpxnf91ann8qy5gpq66nszm6pqc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal Diff directory extra filepath + githash hashable haskeline hledger-lib lucid math-functions + megaparsec mtl old-time process regex-tdfa safe shakespeare split + tabular tasty temporary terminfo text time timeit transformers + unordered-containers utf8-string utility-ht wizards + ]; + executableHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal directory extra filepath githash + haskeline hledger-lib math-functions megaparsec mtl old-time + process regex-tdfa safe shakespeare split tabular tasty temporary + terminfo text time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + testHaskellDepends = [ + aeson ansi-terminal base base-compat-batteries bytestring cmdargs + containers data-default Decimal directory extra filepath githash + haskeline hledger-lib math-functions megaparsec mtl old-time + process regex-tdfa safe shakespeare split tabular tasty temporary + terminfo text time timeit transformers unordered-containers + utf8-string utility-ht wizards + ]; + description = "Command-line interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hledger-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , Decimal, docopt, either, hledger, hledger-lib, microlens @@ -130134,6 +129796,43 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hledger-lib_1_22" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base + , base-compat-batteries, blaze-markup, bytestring, call-stack + , cassava, cassava-megaparsec, cmdargs, containers, data-default + , Decimal, directory, doctest, extra, file-embed, filepath, Glob + , hashtables, megaparsec, mtl, old-time, parser-combinators + , pretty-simple, regex-tdfa, safe, tabular, tasty, tasty-hunit + , template-haskell, text, time, timeit, transformers, uglymemo + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "hledger-lib"; + version = "1.22"; + sha256 = "06qddk2nhjq3g02in3hcxz4hfwq9fcb3356shzbljx7ssmzjakzm"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal directory extra file-embed + filepath Glob hashtables megaparsec mtl old-time parser-combinators + pretty-simple regex-tdfa safe tabular tasty tasty-hunit + template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal directory doctest extra + file-embed filepath Glob hashtables megaparsec mtl old-time + parser-combinators pretty-simple regex-tdfa safe tabular tasty + tasty-hunit template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string + ]; + description = "A reusable library providing the core functionality of hledger"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hledger-makeitso" = callPackage ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time , turtle @@ -130206,6 +129905,31 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger-ui_1_22" = callPackage + ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries + , brick, cmdargs, containers, data-default, directory, extra + , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens + , microlens-platform, process, safe, split, text, text-zipper, time + , transformers, unix, vector, vty + }: + mkDerivation { + pname = "hledger-ui"; + version = "1.22"; + sha256 = "1izidpxwygghq0c3z7pygf9c9qlsydw89gs6475hsd4qiqc06gjr"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base base-compat-batteries brick cmdargs + containers data-default directory extra filepath fsnotify hledger + hledger-lib megaparsec microlens microlens-platform process safe + split text text-zipper time transformers unix vector vty + ]; + description = "Curses-style terminal interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hledger-vty" = callPackage ({ mkDerivation, base, cmdargs, hledger, hledger-lib, HUnit, safe , time, vty @@ -130263,6 +129987,43 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger-web_1_22" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , case-insensitive, clientsession, cmdargs, conduit, conduit-extra + , containers, data-default, Decimal, directory, extra, filepath + , hjsmin, hledger, hledger-lib, hspec, http-client, http-conduit + , http-types, megaparsec, mtl, network, shakespeare + , template-haskell, text, time, transformers, unix-compat + , unordered-containers, utf8-string, wai, wai-cors, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static, yesod-test + }: + mkDerivation { + pname = "hledger-web"; + version = "1.22"; + sha256 = "0miy111zz8yqw0i87sn91aiplznc7fbirznpar8y5mch8z4wn4bs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring case-insensitive + clientsession cmdargs conduit conduit-extra containers data-default + Decimal directory extra filepath hjsmin hledger hledger-lib hspec + http-client http-conduit http-types megaparsec mtl network + shakespeare template-haskell text time transformers unix-compat + unordered-containers utf8-string wai wai-cors wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static yesod-test + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hledger hledger-lib hspec text yesod yesod-test + ]; + description = "Web-based user interface for the hledger accounting system"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hlibBladeRF" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, hlint, libbladeRF }: @@ -134757,6 +134518,29 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) ruby;}; + "hs" = callPackage + ({ mkDerivation, base, containers, data-default, directory + , enum-text, filepath, fmt, optparse-applicative, possibly, text + , typed-process + }: + mkDerivation { + pname = "hs"; + version = "0.1.0.2"; + sha256 = "03hfjw777v2dkj1qcswb9ylqypiqhx5xcsnmksq99si3bi1xyrgm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default directory enum-text filepath fmt + optparse-applicative possibly text typed-process + ]; + executableHaskellDepends = [ + base containers data-default directory enum-text filepath fmt + optparse-applicative possibly text typed-process + ]; + description = "GHC-toolchain installer broker"; + license = lib.licenses.bsd3; + }) {}; + "hs-GeoIP" = callPackage ({ mkDerivation, base, bytestring, deepseq, GeoIP }: mkDerivation { @@ -135818,6 +135602,8 @@ self: { ]; description = "Akamai API(Edgegrid and Netstorage)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsaml2" = callPackage @@ -141390,8 +141176,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.7.2"; - sha256 = "1q0lp8hkzfc0srci9y794q5cqkih50r3iw2c32wbx8h502jcvv1q"; + version = "0.8.8.1"; + sha256 = "0jh7ps2hi72pjzrjwkmq8sq0djwjv9nf9cbxhjb121grg0gzzrbh"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -143345,6 +143131,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -144798,22 +144586,6 @@ self: { }) {}; "hyphenation" = callPackage - ({ mkDerivation, base, bytestring, containers, text - , unordered-containers, zlib - }: - mkDerivation { - pname = "hyphenation"; - version = "0.8.1"; - sha256 = "0pzm9sfn1bw7yvwhby9a6d9z2ghcn91rcbj08x380gff31kn8lbx"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers text unordered-containers zlib - ]; - description = "Configurable Knuth-Liang hyphenation"; - license = lib.licenses.bsd2; - }) {}; - - "hyphenation_0_8_2" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, text , unordered-containers, zlib }: @@ -144828,7 +144600,6 @@ self: { ]; description = "Configurable Knuth-Liang hyphenation"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "hypher" = callPackage @@ -145946,6 +145717,42 @@ self: { license = lib.licenses.mit; }) {}; + "ihaskell_0_10_2_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, exceptions, filepath, ghc + , ghc-boot, ghc-parser, ghc-paths, haskeline, here, hlint, hspec + , hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, text, time, transformers + , unix, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.2.1"; + sha256 = "1bpxm51c8f0cl7cvg7d2f39fnar7a811s3fgxvxmvsb7yw3v92vc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory exceptions filepath ghc ghc-boot ghc-parser ghc-paths + haskeline hlint http-client http-client-tls ipython-kernel mtl + parsec process random shelly split stm strict text time + transformers unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -147967,8 +147774,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.9.1.4"; - sha256 = "021r3ghn3cv1nykkkgyd50gq5cmczam8j37xqfi7vmyx5iwdv0a2"; + version = "0.9.1.5"; + sha256 = "0a0m3bhh910c5g46cwkxgflsgw5ab7lzymwll9hijyvwgnsw3h7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149797,8 +149604,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "3.0.0"; - sha256 = "1hi1q0kiqqp96w29y9699s66rmyr7k0fp6s7z86ll9n3bmf0a4g4"; + version = "3.1.0"; + sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; @@ -155761,6 +155568,108 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; + "keid-core" = callPackage + ({ mkDerivation, adjunctions, base, binary, bytestring + , cryptohash-md5, derive-storable, derive-storable-plugin + , distributive, foldl, geomancy, GLFW-b, ktx-codec + , neat-interpolation, optparse-applicative, optparse-simple + , resourcet, rio, rio-app, StateVar, tagged, template-haskell, text + , transformers, unagi-chan, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-core"; + version = "0.1.0.0"; + sha256 = "05h4dp27sp23ihmr8hvflqr1bqyf590s607sxl9vc1k46k9hc179"; + libraryHaskellDepends = [ + adjunctions base binary bytestring cryptohash-md5 derive-storable + derive-storable-plugin distributive foldl geomancy GLFW-b ktx-codec + neat-interpolation optparse-applicative optparse-simple resourcet + rio rio-app StateVar tagged template-haskell text transformers + unagi-chan unliftio vector vulkan vulkan-utils + VulkanMemoryAllocator zstd + ]; + description = "Core parts of Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-geometry" = callPackage + ({ mkDerivation, base, geomancy, keid-core, rio, rio-app, vulkan }: + mkDerivation { + pname = "keid-geometry"; + version = "0.1.0.0"; + sha256 = "1bhmxgbza1l9qr25g8ad31j70z1dmvsa5gd05fgpwha9liixahsc"; + libraryHaskellDepends = [ + base geomancy keid-core rio rio-app vulkan + ]; + description = "Geometry primitives for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-render-basic" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cryptohash-md5 + , derive-storable, derive-storable-plugin, foldl, geomancy, GLFW-b + , keid-core, neat-interpolation, resourcet, rio, rio-app, tagged + , text, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-render-basic"; + version = "0.1.0.0"; + sha256 = "1rjvf5bxh3llfq1pd9hwy8laida9rhw4f49ca5hn69cnpchpngmy"; + libraryHaskellDepends = [ + aeson base binary bytestring cryptohash-md5 derive-storable + derive-storable-plugin foldl geomancy GLFW-b keid-core + neat-interpolation resourcet rio rio-app tagged text unliftio + vector vulkan vulkan-utils VulkanMemoryAllocator zstd + ]; + description = "Basic rendering programs for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-resource-gltf" = callPackage + ({ mkDerivation, base, bytestring, containers, derive-storable + , derive-storable-plugin, geomancy, gltf-codec, keid-core, rio + , rio-app, vulkan + }: + mkDerivation { + pname = "keid-resource-gltf"; + version = "0.1.0.0"; + sha256 = "1b5dbrlhb44xmgsv4l5mfwficlkjy3k36b01sha0j6yq1bv6mvhj"; + libraryHaskellDepends = [ + base bytestring containers derive-storable derive-storable-plugin + geomancy gltf-codec keid-core rio rio-app vulkan + ]; + description = "GLTF loader for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "keid-ui-dearimgui" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , dear-imgui, derive-storable, derive-storable-plugin, foldl + , geomancy, GLFW-b, keid-core, neat-interpolation, resourcet, rio + , rio-app, tagged, unliftio, vector, vulkan, vulkan-utils + , VulkanMemoryAllocator, zstd + }: + mkDerivation { + pname = "keid-ui-dearimgui"; + version = "0.1.0.0"; + sha256 = "1650h7mbzmkpzs2wjvjh3zwmjkvbcg1h36yk6frlvvf80fhhihjc"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 dear-imgui derive-storable + derive-storable-plugin foldl geomancy GLFW-b keid-core + neat-interpolation resourcet rio rio-app tagged unliftio vector + vulkan vulkan-utils VulkanMemoryAllocator zstd + ]; + description = "DearImGui elements for Keid engine"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , conduit, conduit-extra, directory, filepath, hslogger, network @@ -159612,6 +159521,8 @@ self: { pname = "large-hashable"; version = "0.1.0.4"; sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; + revision = "1"; + editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; libraryHaskellDepends = [ aeson base base16-bytestring bytes bytestring containers scientific strict template-haskell text time transformers unordered-containers @@ -161676,15 +161587,15 @@ self: { }) {inherit (pkgs) leveldb;}; "levenshtein" = callPackage - ({ mkDerivation, base, binary, deepseq, hashable, hspec - , hspec-discover, QuickCheck + ({ mkDerivation, base, binary, data-default, deepseq, hashable + , hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "levenshtein"; - version = "0.1.1.0"; - sha256 = "1a4pz175skaw8s02pa6l2jm7m21sfghivzpd2vm2p08lmmwykx5p"; + version = "0.1.3.0"; + sha256 = "1h9xygy65npn2a5pgngqzm39k9ms3krzn1in9h0adln6aq2kcgdx"; libraryHaskellDepends = [ - base binary deepseq hashable QuickCheck + base binary data-default deepseq hashable QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -163645,8 +163556,8 @@ self: { }: mkDerivation { pname = "linear"; - version = "1.21.5"; - sha256 = "19pvz467wd8gss95qfi90xnd5fwm6dpdppr21g5n30x4m7niymn3"; + version = "1.21.6"; + sha256 = "0ax6prmc7b53w0lz5ddc40wrjj9bm7wldpp57283gx9hdf8qrb35"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable indexed-traversable lens @@ -164647,8 +164558,8 @@ self: { ({ mkDerivation, ansi-terminal, array, ascii-progress, async , attoparsec, base, binary, boxes, cereal, cmdargs, containers , deepseq, directory, fgl, filepath, git, hashable, intern, mtl - , nettools, ocaml, parallel, parsec, pretty, process, stm, syb - , tasty, tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format + , nettools, parallel, parsec, pretty, process, stm, syb, tasty + , tasty-ant-xml, tasty-hunit, tasty-rerun, text, text-format , transformers, unordered-containers, z3 }: mkDerivation { @@ -164665,7 +164576,6 @@ self: { text-format transformers unordered-containers ]; executableHaskellDepends = [ base ]; - executableSystemDepends = [ ocaml ]; testHaskellDepends = [ base containers directory filepath mtl process stm tasty tasty-ant-xml tasty-hunit tasty-rerun transformers @@ -164675,7 +164585,7 @@ self: { description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = lib.licenses.bsd3; }) {inherit (pkgs) git; inherit (pkgs) nettools; - inherit (pkgs) ocaml; inherit (pkgs) z3;}; + inherit (pkgs) z3;}; "liquid-ghc-prim" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: @@ -180659,6 +180569,8 @@ self: { ]; description = "GraphQL support for Mu"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mu-grpc-client" = callPackage @@ -184483,7 +184395,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "net-mqtt_0_8_0_0" = callPackage + "net-mqtt_0_8_0_2" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -184492,8 +184404,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.8.0.0"; - sha256 = "1635kk5619syjj80ynpnd61qdiaxm349qyzhbaa8nc8nm8kkw2gh"; + version = "0.8.0.2"; + sha256 = "0rvsyb9msp1dkba941094d07apdinlda0hg4pb32jxs17wwnj0a7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184523,22 +184435,6 @@ self: { }: mkDerivation { pname = "net-mqtt-lens"; - version = "0.1.0.0"; - sha256 = "1g0vvay4fdvr2n0hxi4w4av39wd70jgi3yixfx98xxydilw1v110"; - libraryHaskellDepends = [ base lens net-mqtt ]; - testHaskellDepends = [ - base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck - ]; - description = "Optics for net-mqtt"; - license = lib.licenses.bsd3; - }) {}; - - "net-mqtt-lens_0_1_1_0" = callPackage - ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "net-mqtt-lens"; version = "0.1.1.0"; sha256 = "0rlib45yqlcij12pij8y690n3ajma35fyj8292b1vggk07dscycq"; libraryHaskellDepends = [ base lens net-mqtt ]; @@ -184547,7 +184443,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "net-mqtt-rpc" = callPackage @@ -188621,31 +188516,32 @@ self: { license = lib.licenses.bsd3; }) {}; - "nri-observability" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs - , bytestring, directory, hostname, http-client, http-client-tls - , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text - , time, unordered-containers + "nri-kafka" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, hw-kafka-client, nri-env-parser, nri-observability + , nri-prelude, safe-exceptions, stm, text, time, unix, uuid }: mkDerivation { - pname = "nri-observability"; - version = "0.1.0.3"; - sha256 = "0njpgc873rh09hkg7pnagkmmrd8nibdq4q1p44wa3n71xzwzy771"; + pname = "nri-kafka"; + version = "0.1.0.0"; + sha256 = "0ifdmli7arrlpmh1l4q974rv0bw3xirfk96xrahfab3zp36r4x3y"; libraryHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers + aeson async base bytestring conduit containers hw-kafka-client + nri-env-parser nri-observability nri-prelude safe-exceptions stm + text time unix uuid ]; testHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers + aeson async base bytestring conduit containers hw-kafka-client + nri-env-parser nri-observability nri-prelude safe-exceptions stm + text time unix uuid ]; - description = "Report log spans collected by nri-prelude"; + description = "Functions for working with Kafka"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; - "nri-observability_0_1_1_1" = callPackage + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, conduit, directory, hostname, http-client , http-client-tls, nri-env-parser, nri-prelude, random @@ -188669,7 +188565,32 @@ self: { ]; description = "Report log spans collected by nri-prelude"; license = lib.licenses.bsd3; + }) {}; + + "nri-postgresql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath + , network, nri-env-parser, nri-observability, nri-prelude + , postgresql-typed, resource-pool, resourcet, safe-exceptions + , template-haskell, text, time + }: + mkDerivation { + pname = "nri-postgresql"; + version = "0.1.0.1"; + sha256 = "1kl5wriqdshhc2fjaicj60hrwrw2c6y8vrq2pv4fagn0gxa78fvc"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring filepath network nri-env-parser + nri-observability nri-prelude postgresql-typed resource-pool + resourcet safe-exceptions template-haskell text time + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring filepath network nri-env-parser + nri-observability nri-prelude postgresql-typed resource-pool + resourcet safe-exceptions template-haskell text time + ]; + description = "Make queries against Postgresql"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nri-prelude" = callPackage @@ -191052,7 +190973,7 @@ self: { broken = true; }) {}; - "opaleye" = callPackage + "opaleye_0_7_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -191062,10 +190983,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.7.1.0"; - sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; - revision = "3"; - editedCabalFile = "14y8nnng9307wb1mafzdr2fmn37cwyfpw9sby8lf9sj467rvghrq"; + version = "0.7.2.0"; + sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -191080,9 +190999,10 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "opaleye_0_7_3_0" = callPackage + "opaleye" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -191108,7 +191028,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -193063,8 +192982,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; - revision = "1"; - editedCabalFile = "14vbfbl2va3s2pa4qjyyny1i15s2iw9993ld5b0qsqdv1z6nfjz1"; + revision = "2"; + editedCabalFile = "172x8990wx4jhyb7yp9k18nd6q4sis8km09x2afr238siqviclrc"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -193091,24 +193010,6 @@ self: { "optparse-simple" = callPackage ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; - version = "0.1.1.3"; - sha256 = "1wymqhac2sngkka8w880gq6y1kk3xs0flbv4mrhfgzrplhax8r9k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_4" = callPackage - ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, th-compat, transformers }: mkDerivation { @@ -193124,7 +193025,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -194733,64 +194633,6 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.14.0.2"; - sha256 = "1jnckx29l6plg1zbkjdfj530djjl8zszwr54zsg0k0is4pcswa9f"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty array attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP - http-client http-client-tls http-types ipynb jira-wiki-markup - JuicyPixels mtl network network-uri pandoc-types parsec process - random safe scientific SHA skylighting skylighting-core split syb - tagsoup temporary texmath text text-conversions time - unicode-collation unicode-transforms unix unordered-containers xml - xml-conduit zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring containers Diff directory doctemplates exceptions - filepath Glob hslua mtl pandoc-types process QuickCheck tasty - tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml - zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers deepseq mtl tasty-bench text time - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_14_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, connection, containers, data-default, deepseq - , Diff, directory, doclayout, doctemplates, emojis, exceptions - , file-embed, filepath, Glob, haddock-library, hslua - , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML - , HTTP, http-client, http-client-tls, http-types, ipynb - , jira-wiki-markup, JuicyPixels, mtl, network, network-uri - , pandoc-types, parsec, process, QuickCheck, random, safe - , scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-collation, unicode-transforms, unix - , unordered-containers, xml, xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; version = "2.14.0.3"; sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; @@ -194827,7 +194669,6 @@ self: { ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -195558,47 +195399,6 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.2.2"; - sha256 = "05ykb6jn19jiakrn6mdcz3gyc6v6hkg3r8drwxncf04syz0l60mm"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = lib.licenses.bsd3; - }) {}; - - "pantry_0_5_2_3" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; version = "0.5.2.3"; sha256 = "17r9fgs83dp0s9wq14q5hvf5vnl8d7cg9p9dnbixgsysq6g6d29g"; libraryHaskellDepends = [ @@ -195624,7 +195424,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -197104,8 +196903,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "1.2.0.0"; - sha256 = "0q3kj5ima8i06rmm5659jhhzfm6shgb3k4sbf34dq1jbwgqrkja1"; + version = "1.3.0.0"; + sha256 = "0qx5q7a9hkj9swpwlxh24c19pf9i6yvlmp44xiwshflz4cf1n8dq"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -199701,42 +199500,6 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.2"; - sha256 = "1fn3hjn3pxxnawvdif691vmxahnmal5ivr5rll0f26ia7rjqrnn2"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data lift-type monad-logger - mtl path-pieces resource-pool resourcet scientific silently - template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck quickcheck-instances resource-pool resourcet - scientific shakespeare silently template-haskell text - th-lift-instances time transformers unliftio unliftio-core - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base criterion deepseq file-embed template-haskell text - ]; - description = "Type-safe, multi-backend data serialization"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_13_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, bytestring, conduit, containers, criterion, deepseq - , fast-logger, file-embed, hspec, http-api-data, lift-type - , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances - , resource-pool, resourcet, scientific, shakespeare, silently - , template-haskell, text, th-lift-instances, time, transformers - , unliftio, unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; version = "2.13.1.1"; sha256 = "0sg51psmpjsz9hiva0gn3xcnd74a6dwbzx1bzi918idcfkpbn496"; libraryHaskellDepends = [ @@ -199759,7 +199522,6 @@ self: { ]; description = "Type-safe, multi-backend data serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -200168,39 +199930,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.2"; - sha256 = "1cbrwzk2s3xrdxpas64slk1habn38xspdg09xj2yazszkmr31hrh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring conduit containers - monad-logger mtl persistent postgresql-libpq postgresql-simple - resource-pool resourcet string-conversions text time transformers - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted http-api-data HUnit - monad-logger path-pieces persistent persistent-qq persistent-test - QuickCheck quickcheck-instances resourcet text time transformers - unliftio unliftio-core unordered-containers vector - ]; - description = "Backend for the persistent library using postgresql"; - license = lib.licenses.mit; - }) {}; - - "persistent-postgresql_2_13_0_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, http-api-data, HUnit, monad-logger - , mtl, path-pieces, persistent, persistent-qq, persistent-test - , postgresql-libpq, postgresql-simple, QuickCheck - , quickcheck-instances, resource-pool, resourcet - , string-conversions, text, time, transformers, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "persistent-postgresql"; version = "2.13.0.3"; sha256 = "06f5yyv8bj3m4zpjwr1k66hkmh1gfy624rnq2g12sjrpz8nrax6j"; isLibrary = true; @@ -200220,7 +199949,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-protobuf" = callPackage @@ -200763,29 +200491,6 @@ self: { }) {}; "pg-transact" = callPackage - ({ mkDerivation, async, base, bytestring, exceptions, hspec - , hspec-expectations-lifted, monad-control, postgresql-libpq - , postgresql-simple, tmp-postgres, transformers - }: - mkDerivation { - pname = "pg-transact"; - version = "0.3.1.1"; - sha256 = "1z101hbfan8aidq7lcnzzni4b7ji8sbbqx1yar6ykf6wmzmn2pcd"; - libraryHaskellDepends = [ - base bytestring exceptions monad-control postgresql-simple - transformers - ]; - testHaskellDepends = [ - async base bytestring exceptions hspec hspec-expectations-lifted - postgresql-libpq postgresql-simple tmp-postgres - ]; - description = "A postgresql-simple transaction monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "pg-transact_0_3_2_0" = callPackage ({ mkDerivation, async, base, bytestring, criterion, deepseq , exceptions, hspec, hspec-expectations-lifted, monad-control , postgresql-libpq, postgresql-simple, tmp-postgres, transformers @@ -201400,28 +201105,30 @@ self: { }) {}; "phonetic-languages-simplified-generalized-examples-array" = callPackage - ({ mkDerivation, base, heaps, mmsyn2-array, parallel + ({ mkDerivation, base, heaps, mmsyn2-array, mmsyn3, parallel , phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array , phonetic-languages-phonetics-basics, phonetic-languages-plus , phonetic-languages-simplified-base , phonetic-languages-simplified-generalized-examples-common - , phonetic-languages-simplified-generalized-properties-array, subG + , phonetic-languages-simplified-generalized-properties-array + , process, subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.3.0.0"; - sha256 = "15k2nij8rpf1yvm5kjgkrvx1y4zlfskxfdxjbjirmaidamr2ha6d"; + version = "0.4.1.1"; + sha256 = "1xk4vj7bj93s8r9l09z2w9h0sbkd73qcv441jisa04m0s6hlhgby"; libraryHaskellDepends = [ - base heaps mmsyn2-array parallel + base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-plus phonetic-languages-simplified-base phonetic-languages-simplified-generalized-examples-common - phonetic-languages-simplified-generalized-properties-array subG + phonetic-languages-simplified-generalized-properties-array process + subG ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; @@ -205446,6 +205153,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-keyed-state" = callPackage + ({ mkDerivation, base, constraints, constraints-extras, hspec + , polysemy, QuickCheck, some, StateVar, trivial-constraint + }: + mkDerivation { + pname = "polysemy-keyed-state"; + version = "0.1"; + sha256 = "00jcb0rd7s8yvflqx6xjas10lgh0dmg4ywb18cbkm8xd0pdn0d2j"; + libraryHaskellDepends = [ + base constraints constraints-extras polysemy some StateVar + trivial-constraint + ]; + testHaskellDepends = [ + base constraints constraints-extras hspec polysemy QuickCheck some + StateVar trivial-constraint + ]; + description = "Effect for a set of stateful values indexed by a type of keys"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-kvstore-jsonfile" = callPackage ({ mkDerivation, aeson, base, containers, exceptions, extra, path , polysemy, polysemy-zoo, unliftio-path @@ -206564,16 +206292,17 @@ self: { }) {inherit (pkgs) acl;}; "posix-api" = callPackage - ({ mkDerivation, base, byteslice, primitive, primitive-addr - , primitive-offset, primitive-unlifted, systemd, tasty, tasty-hunit + ({ mkDerivation, base, byte-order, byteslice, primitive + , primitive-addr, primitive-offset, primitive-unlifted, run-st + , systemd, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.3.4.0"; - sha256 = "163bblw200jr2vghc7i9g9xls6vhihayxvb4am4lr3j047ifqbmb"; + version = "0.3.5.0"; + sha256 = "0ygww5fcikalyqzliqdrcd4n4g8plhr01gz5p6zd0c5f1y9jgw7x"; libraryHaskellDepends = [ - base byteslice primitive primitive-addr primitive-offset - primitive-unlifted + base byte-order byteslice primitive primitive-addr primitive-offset + primitive-unlifted run-st ]; librarySystemDepends = [ systemd ]; testHaskellDepends = [ @@ -207430,19 +207159,18 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, fast-builder - , hashable, headed-megaparsec, hedgehog, megaparsec - , parser-combinators, QuickCheck, quickcheck-instances, rerebase - , tasty, tasty-hunit, tasty-quickcheck, text, text-builder - , unordered-containers + ({ mkDerivation, base, bytestring, case-insensitive, hashable + , headed-megaparsec, hedgehog, megaparsec, parser-combinators + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.3.0.3"; - sha256 = "0zylrzd8dfks1jdx1yq1i2n2a7sxa8b04h6km9lx3bdpbpv84y7i"; + version = "0.4"; + sha256 = "133p9w35q7ynb15i97k9ci4w14vp5117v3hmgm4ys3jj07apjyxd"; libraryHaskellDepends = [ - base bytestring case-insensitive fast-builder hashable - headed-megaparsec megaparsec parser-combinators text text-builder + base bytestring case-insensitive hashable headed-megaparsec + megaparsec parser-combinators text text-builder unordered-containers ]; testHaskellDepends = [ @@ -211360,8 +211088,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.0"; - sha256 = "0y1vvcy0rdiraphi6c9i1xsw5zwdqsw0id40xhgvk37va36ryl3p"; + version = "0.9.1"; + sha256 = "1l2rxhs5v8mi77qw98849m0w2swwxvg5wm6d4j123sa29riyb70a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -211379,8 +211107,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, SDL2 }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.0"; - sha256 = "0ksdb89phsdjjq5q043wvqi3swibfd1840180jg3m8wj3zcy5g3k"; + version = "0.9.1"; + sha256 = "1qgb7zj7sj8sc3b7fwfq51s5m997dqgx74dmmkfam2s4v46fhqr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -212857,8 +212585,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.14.2"; - sha256 = "12gk4c311v39gh0kp5s97gia2xrglzzkpnhisbpxc4h7nd9dqf5m"; + version = "0.14.3"; + sha256 = "0g0zly5wh75w8p09zq6sy25phbb432vb0allmcbx34vd84nm70ia"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212971,8 +212699,8 @@ self: { }: mkDerivation { pname = "purescript-cst"; - version = "0.2.0.0"; - sha256 = "0spsl9aq7hg2pkqawwjirgdr8ypzpb9amf2pznxmn6wm9ppaq73s"; + version = "0.3.0.0"; + sha256 = "15gf3fxpqngnx75w7g8nyvmj452y3x9p8ymwwk4mkzql0zps2fy2"; libraryHaskellDepends = [ aeson array base base-compat bytestring containers deepseq dlist filepath microlens mtl protolude scientific semigroups serialise @@ -218621,8 +218349,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.3"; - sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj"; + version = "2.2.4.4"; + sha256 = "09zssx2yqz22hm678ik5zz2zkanzfazcyfqmwlxc9mk6gxxdy6ia"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = lib.licenses.bsd3; @@ -222505,6 +222233,8 @@ self: { pname = "req"; version = "3.9.1"; sha256 = "0468ah4142jrqp5l3pw4izrw6f6kznisan888b30jhif4c6xncr0"; + revision = "1"; + editedCabalFile = "0g2g8l1nhmqxgk2ylvavv7rw6bq73d3awd21l438mzzljqj4kvh8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -223513,6 +223243,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "retry_0_9_0_0" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl + , random, stm, tasty, tasty-hedgehog, tasty-hunit, time + , transformers + }: + mkDerivation { + pname = "retry"; + version = "0.9.0.0"; + sha256 = "0n304r6vyx238558z62kz7nii8y58h2z4iyx54gbkxmz9dsck4ff"; + libraryHaskellDepends = [ + base exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base exceptions ghc-prim hedgehog HUnit mtl random stm tasty + tasty-hedgehog tasty-hunit time transformers + ]; + description = "Retry combinators for monadic actions that may fail"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -232361,34 +232112,6 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.18.2"; - sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5"; - revision = "1"; - editedCabalFile = "0f783bj89vb7j5cj5hk6hdmplhk3ay1z6swsinlr7a7f9h59x6vh"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bifunctors bytestring - case-insensitive deepseq http-api-data http-media http-types mmorph - mtl network-uri QuickCheck singleton-bool sop-core - string-conversions tagged text transformers vault - ]; - testHaskellDepends = [ - aeson base base-compat bytestring hspec http-media mtl QuickCheck - quickcheck-instances string-conversions text transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant_0_18_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors - , bytestring, case-insensitive, deepseq, hspec, hspec-discover - , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, singleton-bool, sop-core - , string-conversions, tagged, text, transformers, vault - }: - mkDerivation { - pname = "servant"; version = "0.18.3"; sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; libraryHaskellDepends = [ @@ -232404,7 +232127,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-JuicyPixels" = callPackage @@ -232944,38 +232666,6 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.18.2"; - sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1"; - revision = "1"; - editedCabalFile = "1phjfsqzmwc5m45f9zbpp76f7f9z96v0in7ngxz6pj8r90bcv8ga"; - libraryHaskellDepends = [ - base base-compat bytestring containers deepseq exceptions - http-client http-media http-types kan-extensions monad-control mtl - semigroupoids servant servant-client-core stm text time - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring entropy hspec http-api-data - http-client http-types HUnit kan-extensions markdown-unlit mtl - network QuickCheck servant servant-client-core servant-server - sop-core stm tdigest text transformers transformers-compat wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , deepseq, entropy, exceptions, hspec, hspec-discover - , http-api-data, http-client, http-media, http-types, HUnit - , kan-extensions, markdown-unlit, monad-control, mtl, network - , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, sop-core, stm, tdigest, text, time, transformers - , transformers-base, transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-client"; version = "0.18.3"; sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; libraryHaskellDepends = [ @@ -232993,7 +232683,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-core" = callPackage @@ -233004,29 +232693,6 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.18.2"; - sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r"; - revision = "2"; - editedCabalFile = "0clbchlla9r0scz0giqmy3pwsnlfcf19hwkqj3yl1y77qx7kv4lr"; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring containers - deepseq exceptions free http-media http-types network-uri safe - servant sop-core template-haskell text transformers - ]; - testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Core functionality and class for client function generation for servant APIs"; - license = lib.licenses.bsd3; - }) {}; - - "servant-client-core_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, deepseq, exceptions, free, hspec - , hspec-discover, http-media, http-types, network-uri, QuickCheck - , safe, servant, sop-core, template-haskell, text, transformers - }: - mkDerivation { - pname = "servant-client-core"; version = "0.18.3"; sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; libraryHaskellDepends = [ @@ -233038,7 +232704,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client-js" = callPackage @@ -233196,36 +232861,6 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.8"; - sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; - revision = "1"; - editedCabalFile = "0bfhypzm02aqwckjrvjmhvf602di0pmp4r0rjbfcraxzvkrzm6qv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring case-insensitive - hashable http-media http-types lens servant string-conversions text - universe-base unordered-containers - ]; - executableHaskellDepends = [ - aeson base lens servant string-conversions text - ]; - testHaskellDepends = [ - aeson base base-compat lens servant string-conversions tasty - tasty-golden tasty-hunit transformers - ]; - description = "generate API docs for your servant webservice"; - license = lib.licenses.bsd3; - }) {}; - - "servant-docs_0_11_9" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, hashable, http-media, http-types, lens, servant - , string-conversions, tasty, tasty-golden, tasty-hunit, text - , transformers, universe-base, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; version = "0.11.9"; sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; isLibrary = true; @@ -233244,7 +232879,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-docs-simple" = callPackage @@ -233476,25 +233110,6 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.15.3"; - sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; - revision = "2"; - editedCabalFile = "1fdbxyyp2h5gcighjrww2mbg8z6givmhx2in8293kw58w7y2im0i"; - libraryHaskellDepends = [ - base base-compat http-types lens servant text - ]; - testHaskellDepends = [ base hspec servant ]; - testToolDepends = [ hspec-discover ]; - description = "Helpers for generating clients for servant APIs in any programming language"; - license = lib.licenses.bsd3; - }) {}; - - "servant-foreign_0_15_4" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover - , http-types, lens, servant, text - }: - mkDerivation { - pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; libraryHaskellDepends = [ @@ -233504,7 +233119,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-gdp" = callPackage @@ -233667,43 +233281,6 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18.2"; - sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0"; - revision = "1"; - editedCabalFile = "0hkcyz93px5x6l5nyh9ymswhwpfidbji2kmlhrw7ksg4zsxkl2p9"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive containers deepseq - exceptions http-common http-media http-streams http-types - io-streams kan-extensions monad-control mtl semigroupoids servant - servant-client-core text time transformers transformers-base - transformers-compat - ]; - testHaskellDepends = [ - aeson base base-compat bytestring deepseq entropy hspec - http-api-data http-streams http-types HUnit kan-extensions - markdown-unlit mtl network QuickCheck servant servant-client-core - servant-server stm tdigest text transformers transformers-compat - wai warp - ]; - testToolDepends = [ hspec-discover markdown-unlit ]; - description = "Automatic derivation of querying functions for servant"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-http-streams_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring - , case-insensitive, containers, deepseq, entropy, exceptions, hspec - , hspec-discover, http-api-data, http-common, http-media - , http-streams, http-types, HUnit, io-streams, kan-extensions - , markdown-unlit, monad-control, mtl, network, QuickCheck - , semigroupoids, servant, servant-client-core, servant-server, stm - , tdigest, text, time, transformers, transformers-base - , transformers-compat, wai, warp - }: - mkDerivation { - pname = "servant-http-streams"; version = "0.18.3"; sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; libraryHaskellDepends = [ @@ -234191,27 +233768,6 @@ self: { }: mkDerivation { pname = "servant-pipes"; - version = "0.15.2"; - sha256 = "1r5irq09j64iapi5n9mzsph984r5f7cyr6zz4sw3xqh648dmf75h"; - libraryHaskellDepends = [ - base bytestring monad-control mtl pipes pipes-safe servant - ]; - testHaskellDepends = [ - base base-compat bytestring http-client http-media pipes - pipes-bytestring pipes-safe servant servant-client servant-server - wai warp - ]; - description = "Servant Stream support for pipes"; - license = lib.licenses.bsd3; - }) {}; - - "servant-pipes_0_15_3" = callPackage - ({ mkDerivation, base, base-compat, bytestring, http-client - , http-media, monad-control, mtl, pipes, pipes-bytestring - , pipes-safe, servant, servant-client, servant-server, wai, warp - }: - mkDerivation { - pname = "servant-pipes"; version = "0.15.3"; sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; libraryHaskellDepends = [ @@ -234224,7 +233780,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-polysemy" = callPackage @@ -234629,43 +234184,6 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.18.2"; - sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih"; - revision = "1"; - editedCabalFile = "0xhq2rpc4ry1xgwz835bcm8qdnsifpc8wck9wa5r510ff21dqw4d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant sop-core string-conversions - tagged text transformers transformers-base wai wai-app-static word8 - ]; - executableHaskellDepends = [ - aeson base base-compat servant text wai warp - ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring directory hspec - hspec-wai http-types mtl QuickCheck resourcet safe servant - should-not-typecheck string-conversions temporary text transformers - transformers-compat wai wai-extra - ]; - testToolDepends = [ hspec-discover ]; - description = "A family of combinators for defining webservices APIs and serving them"; - license = lib.licenses.bsd3; - }) {}; - - "servant-server_0_18_3" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, containers, directory, exceptions, filepath, hspec - , hspec-discover, hspec-wai, http-api-data, http-media, http-types - , monad-control, mtl, network, network-uri, QuickCheck, resourcet - , safe, servant, should-not-typecheck, sop-core, string-conversions - , tagged, temporary, text, transformers, transformers-base - , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 - }: - mkDerivation { - pname = "servant-server"; version = "0.18.3"; sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; isLibrary = true; @@ -234688,7 +234206,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-server-namedargs" = callPackage @@ -236020,35 +235537,6 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "2.3.0"; - sha256 = "1ky0jj47xp6g8shk5znrhncj71sg0p653csj1ds2yl36s7fiwgdk"; - libraryHaskellDepends = [ - array base bytestring containers data-fix deepseq - invertible-grammar prettyprinter recursion-schemes scientific - semigroups text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Invertible grammar combinators for S-expressions"; - license = lib.licenses.bsd3; - }) {}; - - "sexp-grammar_2_3_1" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, data-fix, deepseq, happy, invertible-grammar - , prettyprinter, QuickCheck, recursion-schemes, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , utf8-string - }: - mkDerivation { - pname = "sexp-grammar"; version = "2.3.1"; sha256 = "05vj998wzj1wja4848kd04c89jb8pmvdyl40aw6qvc9fq0qzw6m4"; libraryHaskellDepends = [ @@ -236067,7 +235555,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -236438,8 +235925,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19.4"; - sha256 = "1vkkgncar07na4kn3i02b2zdyjdjxl10hrcz2l23c498yrrqibjv"; + version = "0.19.5"; + sha256 = "105agfvn75czyq3jbmppybv776njlsqc7k4m1xnx0n78qjmcnpb9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -238486,23 +237973,11 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.6"; - sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; - libraryHaskellDepends = [ base optparse-applicative ]; - description = "Simple command args parsing and execution"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd-args_0_1_7" = callPackage - ({ mkDerivation, base, optparse-applicative }: - mkDerivation { - pname = "simple-cmd-args"; version = "0.1.7"; sha256 = "0lf0pyiv02sg2yh9avj92fm75sni61qnaq3rmjw5vlczy03ksxpc"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-conduit" = callPackage @@ -240350,27 +239825,6 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.5.1"; - sha256 = "11y2j9c4gw0x5h974jrp0yppy5dys9i0nxdbzm374nwx8mjwdl4w"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - }) {}; - - "skylighting_0_10_5_2" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; version = "0.10.5.2"; sha256 = "152ywiy7h04xjy0fdl571jwahl6c9350isqbm4p0na4cjd9cczzh"; configureFlags = [ "-fexecutable" ]; @@ -240384,7 +239838,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -240397,37 +239850,6 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.5.1"; - sha256 = "14mz7krfkidgplhp49w84ryz74jrsdqll44wqd0my0m28v2vg9ka"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath mtl safe text transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_10_5_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string - , xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; version = "0.10.5.2"; sha256 = "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d"; isLibrary = true; @@ -240447,7 +239869,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -246064,10 +245485,8 @@ self: { }: mkDerivation { pname = "sr-extra"; - version = "1.85.1"; - sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x"; - revision = "1"; - editedCabalFile = "0pmf6vlxv8kd6imq9xwnfc8j3mk6yswvcirdmb2hi8ql41cqwnay"; + version = "1.88"; + sha256 = "1cpigfdpgcy3bpp51snza0wwd88ky04hwqlzbmvmwkwznd7wqxrb"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -249529,28 +248948,25 @@ self: { }) {}; "streaming-benchmarks" = callPackage - ({ mkDerivation, base, bench-graph, bytestring, Chart - , Chart-diagrams, conduit, csv, deepseq, directory, drinkery, gauge - , getopt-generics, machines, mtl, pipes, random, split, streaming - , streamly, template-haskell, text, transformers, typed-process - , vector + ({ mkDerivation, base, bytestring, conduit, containers, deepseq + , dlist, drinkery, gauge, machines, mtl, pipes, random, streaming + , streamly, template-haskell, text, transformers, vector }: mkDerivation { pname = "streaming-benchmarks"; - version = "0.2.0"; - sha256 = "1vpflmvz2vrll9bangl61rdjnngdxbrmpzg3xha8h85ij3458c0x"; + version = "0.3.0"; + sha256 = "0cy65d1aph2wk3yc7kj8ywq40f8jgpx72isywnnw2sg9jz9jnd85"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - base bench-graph bytestring Chart Chart-diagrams csv directory - getopt-generics split text transformers typed-process - ]; benchmarkHaskellDepends = [ - base conduit deepseq drinkery gauge machines mtl pipes random - streaming streamly template-haskell transformers vector + base bytestring conduit containers deepseq dlist drinkery gauge + machines mtl pipes random streaming streamly template-haskell text + transformers vector ]; - description = "Benchmarks to compare streaming packages"; + description = "Measures and compares the performance of streaming libraries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streaming-binary" = callPackage @@ -249616,27 +249032,6 @@ self: { }: mkDerivation { pname = "streaming-bytestring"; - version = "0.2.0"; - sha256 = "1vmbg84xc7ix7ihs96ia13gdpi7z3grrkq9qai6j8s1klnzpljhi"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; version = "0.2.1"; sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; libraryHaskellDepends = [ @@ -249649,7 +249044,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -251042,23 +250436,11 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; - version = "1.0.2.8"; - sha256 = "03sqgmbbjqi18wjb96sc3lvc6p3bqk5sgsgbcf9z8k9rbdspribm"; - libraryHaskellDepends = [ base bytestring text ]; - description = "Types for the Stripe API"; - license = lib.licenses.mit; - }) {}; - - "stripe-concepts_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "stripe-concepts"; version = "1.0.3"; sha256 = "1wykg9flg0qliqlz3ywkmnqhh55aa61r4mvbhsly6ib8r6knr382"; libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "stripe-core" = callPackage @@ -251295,6 +250677,28 @@ self: { license = lib.licenses.mit; }) {}; + "strong-path" = callPackage + ({ mkDerivation, base, exceptions, filepath, path, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "strong-path"; + version = "1.0.0.0"; + sha256 = "0xpflbqzdbf7pk2v5c5acd5j4ijldklx0vvypw36zvy50ld4ffpz"; + libraryHaskellDepends = [ + base exceptions filepath path template-haskell + ]; + testHaskellDepends = [ + base filepath path tasty tasty-discover tasty-hspec + tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "Strongly typed paths in Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "strongswan-sql" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base , bytestring, data-default, failable, haskeline, io-streams @@ -253309,7 +252713,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_1" = callPackage + "sydtest_0_3_0_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -253318,8 +252722,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.1"; - sha256 = "0ddbjs2p2vzmzadggyvdpknmcw935jmj2m9nxki2apc9ciq6skig"; + version = "0.3.0.2"; + sha256 = "1823g9czwgf0p0jyxlddqwnpwhs3622892c9ah6cacvl9xfl3sg9"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -255144,6 +254548,23 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; + "systemd-socket-activation" = callPackage + ({ mkDerivation, base, containers, network, text, transformers + , unix + }: + mkDerivation { + pname = "systemd-socket-activation"; + version = "1"; + sha256 = "10y7g2y62v48n6zkpgpjqyf2a7fqm8d9mx24vcwk6bcxkq1bciz2"; + revision = "1"; + editedCabalFile = "084phqk9wb0slsmb7pj68nivhjx3w6hs0djq589j771v579vck0r"; + libraryHaskellDepends = [ + base containers network text transformers unix + ]; + description = "Let systemd bind the server's socket for you"; + license = lib.licenses.mit; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -257131,6 +256552,20 @@ self: { broken = true; }) {}; + "tasty-prelude" = callPackage + ({ mkDerivation, base, tasty, tasty-expected-failure, tasty-focus + }: + mkDerivation { + pname = "tasty-prelude"; + version = "0.1.0.0"; + sha256 = "0kccgw0g45cll69hc9f5sifzpsmvcjskcyfvfqnd5zmdh4vcnj70"; + libraryHaskellDepends = [ + base tasty tasty-expected-failure tasty-focus + ]; + description = "Unopinionated top-level entry point to tasty ecosystem"; + license = lib.licenses.mpl20; + }) {}; + "tasty-program" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, process, tasty }: @@ -257202,29 +256637,6 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.2.1"; - sha256 = "1i39xks5rjpnid2y1n16fyb01wj7hpdw0n5ci1rnsps5f16nkcxr"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - }) {}; - - "tasty-silver_3_2_2" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit - , temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; version = "3.2.2"; sha256 = "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"; libraryHaskellDepends = [ @@ -257238,7 +256650,6 @@ self: { ]; description = "A fancy test runner, including support for golden tests"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-smallcheck" = callPackage @@ -257982,28 +257393,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron , filepath, hashable, http-api-data, http-client, http-client-tls , monad-control, mtl, pretty-show, profunctors, servant - , servant-client, servant-multipart, split, stm, template-haskell - , text, time, transformers, unordered-containers + , servant-client, servant-multipart, servant-multipart-api + , servant-multipart-client, split, stm, template-haskell, text + , time, transformers, unordered-containers }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.3.5"; - sha256 = "08b650z513lbmmb46xinwgdb3csgpx9rjk5vn345xb9b0ki94chq"; + version = "0.3.7"; + sha256 = "09bi2rbajiv3p2anky9zjnbvxxd79d70p3im94zrp14db0zjhnp7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl pretty-show profunctors servant servant-client servant-multipart - split stm template-haskell text time transformers - unordered-containers + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl pretty-show profunctors servant servant-client servant-multipart - split stm template-haskell text time transformers - unordered-containers + servant-multipart-api servant-multipart-client split stm + template-haskell text time transformers unordered-containers ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; @@ -258219,23 +257631,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.5"; - sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_6" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; version = "0.1.6"; sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "template-haskell-optics" = callPackage @@ -260897,14 +260297,16 @@ self: { }) {}; "text1" = callPackage - ({ mkDerivation, base, binary, HUnit, lens, QuickCheck, semigroups - , text + ({ mkDerivation, base, binary, HUnit, lens, QuickCheck + , semigroupoids, semigroups, text }: mkDerivation { pname = "text1"; - version = "0.0.6.1"; - sha256 = "10kzl1gwi08pxzs8flr5bhfcwqgcl0jz9cadw3hqmbmynpij95ij"; - libraryHaskellDepends = [ base binary lens semigroups text ]; + version = "0.0.7.0"; + sha256 = "0ph9vyx88mwh4d6n0wxbhicjc1x3d645kglw82nr5ggapgsab2a1"; + libraryHaskellDepends = [ + base binary lens semigroupoids semigroups text + ]; testHaskellDepends = [ base HUnit lens QuickCheck semigroups text ]; @@ -262402,6 +261804,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "throwable-exceptions gives the easy way to throw exceptions"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "thumbnail" = callPackage @@ -262616,28 +262020,6 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.7.5"; - sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - network parsec primitive random text transformers - ]; - testHaskellDepends = [ - base containers deepseq hosc microspec parsec - ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = lib.licenses.gpl3Only; - }) {}; - - "tidal_1_7_7" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, network, parsec - , primitive, random, text, transformers, weigh - }: - mkDerivation { - pname = "tidal"; version = "1.7.7"; sha256 = "19r9h45yd2xwmah81xqmwx5bi5gi0x2hqhq2nqa47jgb0nd12a25"; enableSeparateDataOutput = true; @@ -262651,7 +262033,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -264410,6 +263791,8 @@ self: { ]; description = "Start and stop a temporary postgres"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -266557,27 +265940,12 @@ self: { }: mkDerivation { pname = "traverse-with-class"; - version = "1.0.1.0"; - sha256 = "1yni197sxfpsjvjablhn8mjqpp1mz0v30r73f9ncs3pjcl93g6yn"; - libraryHaskellDepends = [ base template-haskell transformers ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Generic applicative traversals"; - license = lib.licenses.mit; - }) {}; - - "traverse-with-class_1_0_1_1" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "traverse-with-class"; version = "1.0.1.1"; sha256 = "0c0h902hr3gnlmlvqjhz3k5abyg0ays2g2c1kwrhbz0nhgfwk656"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Generic applicative traversals"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "travis" = callPackage @@ -267764,22 +267132,6 @@ self: { }: mkDerivation { pname = "ttc"; - version = "1.1.0.0"; - sha256 = "02b55f0dwgxvpr8x2727ryb6zhvz73l6l001szm4i821q0p4h00g"; - libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit template-haskell text - ]; - description = "Textual Type Classes"; - license = lib.licenses.mit; - }) {}; - - "ttc_1_1_0_1" = callPackage - ({ mkDerivation, base, bytestring, tasty, tasty-hunit - , template-haskell, text - }: - mkDerivation { - pname = "ttc"; version = "1.1.0.1"; sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; libraryHaskellDepends = [ base bytestring template-haskell text ]; @@ -267788,7 +267140,6 @@ self: { ]; description = "Textual Type Classes"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ttl-hashtables" = callPackage @@ -269698,6 +269049,24 @@ self: { broken = true; }) {}; + "typeable-mock" = callPackage + ({ mkDerivation, base, call-stack, containers, hspec + , variadic-function + }: + mkDerivation { + pname = "typeable-mock"; + version = "0.1.0.1"; + sha256 = "1hfjyk5r2xikwfdz5hfiffc22dci821xzcj8lnml4kh7d0w55mfa"; + libraryHaskellDepends = [ + base call-stack containers variadic-function + ]; + testHaskellDepends = [ + base call-stack containers hspec variadic-function + ]; + description = "Mock functions and expressions anywhere"; + license = lib.licenses.bsd3; + }) {}; + "typeable-th" = callPackage ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { @@ -271938,8 +271307,8 @@ self: { ({ mkDerivation, base, bytestring, unordered-containers }: mkDerivation { pname = "uniq-deep"; - version = "1.2.0"; - sha256 = "1r0gq0mlnl9wdn3v0pdq3vnwn6r4pzc6j7ssha93lms9380kl4nx"; + version = "1.2.1"; + sha256 = "0281yfiv6qmq1q5pvrvf6qg4nwzzav6rvb4mcdzqshsrbw9n12ig"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -273585,22 +272954,20 @@ self: { "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics - , hedgehog, HUnit, network-uri, safe, semigroups, tasty - , tasty-hedgehog, tasty-hunit, template-haskell, th-lift-instances - , transformers + , hedgehog, HUnit, network-uri, safe, tasty, tasty-hedgehog + , tasty-hunit, template-haskell, th-lift-instances, transformers }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.3.0"; - sha256 = "1zpynqz2q29cfk77n0d6lrnzmrqqi5nijvqd2pkz2fax3s6qhysz"; + version = "0.3.3.1"; + sha256 = "0s0k26v5x6601rbpkjkl5vp3dkp9xwj1dlgy4xkl470i4sna1rzk"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers template-haskell th-lift-instances ]; testHaskellDepends = [ attoparsec base base-compat blaze-builder bytestring containers - hedgehog HUnit safe semigroups tasty tasty-hedgehog tasty-hunit - transformers + hedgehog HUnit safe tasty tasty-hedgehog tasty-hunit transformers ]; benchmarkHaskellDepends = [ base blaze-builder bytestring criterion deepseq deepseq-generics @@ -275210,25 +274577,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.11.0.0"; - sha256 = "1jawa7d37al29zp2b5hba9w348g926ckbxp51l9bprii5v47lyln"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = lib.licenses.mit; - }) {}; - - "validity_0_11_0_1" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; version = "0.11.0.1"; sha256 = "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -275529,8 +274883,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "variadic-function"; - version = "0.1.0.1"; - sha256 = "0p458anbqlx23x77wp1nh465za3dad5s0gjrkdhi364rr4v58i3a"; + version = "0.1.0.2"; + sha256 = "0kwrhraq45vb9bs0xn4xbahywwrxcspmvmc4l133rilgzx2gcv5w"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Create and transform functions with variable arity"; @@ -276048,6 +275402,24 @@ self: { license = lib.licenses.mit; }) {}; + "vector-builder_0_3_8_2" = callPackage + ({ mkDerivation, attoparsec, base, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.8.2"; + sha256 = "1g1zxp6xcwcq3372a5qqs44cl09a48p21m1jsys5bsampprlmcgs"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -276342,24 +275714,6 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.3.1"; - sha256 = "0vm6wvbn3g4r028p46yh24rz7pr429w03jshpwyj2z2c6b058klr"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ expipiplus1 ]; - }) {}; - - "vector-sized_1_4_4" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; version = "1.4.4"; sha256 = "0rlzwxcxzrxg7nwqijigj80fr4fyi5c2a8785898kir5hcyd6v1d"; libraryHaskellDepends = [ @@ -276368,7 +275722,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; @@ -277930,8 +277283,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.11.1"; - sha256 = "18ci35csymc788hr2md5cfxmra3ad0rc5mrbk37jjf0qga9a375x"; + version = "3.11.2"; + sha256 = "1pvszf89q1b7r5a1lzdvc28cylmlgnvvss5nw6497iclzh6hs82i"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -280145,39 +279498,6 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.16"; - sha256 = "1qnngw7afh448hv7fzp4l36j7hz6f8a8f1qga976j8l53qhmgcf1"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers ghc-prim hashable http-date http-types http2 iproute - network simple-sendfile stm streaming-commons text time-manager - unix unix-compat unliftio vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute network - process QuickCheck simple-sendfile stm streaming-commons text time - time-manager unix unix-compat unliftio vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat unliftio x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - }) {}; - - "warp_3_3_17" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, unliftio, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; version = "3.3.17"; sha256 = "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0"; libraryHaskellDepends = [ @@ -280199,7 +279519,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -280265,8 +279584,8 @@ self: { ({ mkDerivation, base, network, systemd, unix, wai, warp }: mkDerivation { pname = "warp-systemd"; - version = "0.1.1.0"; - sha256 = "1gi9xkaa3wi5n2vhmlc7s4zm48l2fakwnd7bw007hzfqi17zz13x"; + version = "0.2.0.0"; + sha256 = "114ipqsfvg4bx15n7mnpym8pnj668854s4vdz188awzd0n60hf8z"; libraryHaskellDepends = [ base network systemd unix wai warp ]; description = "Socket activation and other systemd integration for the Warp web server (WAI)"; license = lib.licenses.bsd3; @@ -282451,8 +281770,8 @@ self: { pname = "windns"; version = "0.1.0.1"; sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8"; - revision = "2"; - editedCabalFile = "129amxjf05b6vi9ln8ijxry062av8bmv3wnng0jis71fyw8ldr0p"; + revision = "3"; + editedCabalFile = "10jidn34rmv0amhw3c24pkl64q5xl3c6l9yqwcvqdn0vkbd0bf2v"; libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library"; @@ -285267,34 +284586,6 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.8.3"; - sha256 = "11g6bfir21wgafnkzzx26r6mz8m39isaz2yqw92k5ymdb1qhs95q"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary-search bytestring conduit - containers data-default deepseq errors extra filepath lens mtl - network-uri old-locale safe text time transformers vector xeno - xml-conduit zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck text time vector - xml-conduit - ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; - description = "Simple and incomplete Excel file parser/writer"; - license = lib.licenses.mit; - }) {}; - - "xlsx_0_8_4" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search - , bytestring, conduit, containers, criterion, data-default, deepseq - , Diff, errors, extra, filepath, groom, lens, mtl, network-uri - , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xeno - , xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; version = "0.8.4"; sha256 = "0xmz9qpqyz2gwlrjsy2m79s4xswb6lz7fbvybd4awg5vy0y6pl41"; libraryHaskellDepends = [ @@ -285311,7 +284602,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Simple and incomplete Excel file parser/writer"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "xlsx-tabular" = callPackage @@ -288258,27 +287548,6 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.6.1.1"; - sha256 = "1iiaixd1xrqjcvknl9g3yvr26nbpfa2amh2ayfxmnpjlxvdhfnyn"; - libraryHaskellDepends = [ - aeson base bytestring conduit data-default-class directory - fast-logger file-embed monad-logger shakespeare streaming-commons - template-haskell text unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod_1_6_1_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit - , data-default-class, directory, fast-logger, file-embed - , monad-logger, shakespeare, streaming-commons, template-haskell - , text, unix, unordered-containers, wai, wai-extra, wai-logger - , warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; version = "1.6.1.2"; sha256 = "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"; libraryHaskellDepends = [ @@ -288289,7 +287558,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-alerts" = callPackage @@ -288951,43 +288219,6 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.6.20.1"; - sha256 = "1y24sn30fm7bjq9rfv4lclz3vraaac9qbd2xgz949agm2irjwg4p"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq entropy fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod-core_1_6_20_2" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, entropy - , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit - , memory, monad-logger, mtl, network, parsec, path-pieces - , primitive, random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; version = "1.6.20.2"; sha256 = "184j6nslwrfxw4zmsxlii6gs1z0h350kgmbnr5y3wwk3n4dsdzyb"; libraryHaskellDepends = [ @@ -289010,7 +288241,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -289301,8 +288531,8 @@ self: { }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "3.0.0"; - sha256 = "19lnn0xw13gcvp2jzw01pq47jfhxgwm1c84px3xm582p9vqyygx7"; + version = "3.0.1"; + sha256 = "0yf4b14y8b5066lwdr7r2ayiavsnkar3s8q984yb1nrz5956f7qd"; libraryHaskellDepends = [ base blaze-html blaze-markup shakespeare text yesod-core yesod-form ]; @@ -289955,15 +289185,15 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, aeson, base, classy-prelude, http-conduit + ({ mkDerivation, aeson, base, http-conduit, string-transform, text , yesod-core, yesod-form }: mkDerivation { pname = "yesod-recaptcha2"; - version = "1.0.1"; - sha256 = "0mf9n016jxiq6ayq80fv9zldfjh9yskcq8p9grfr0dl8njj88yn5"; + version = "1.0.2"; + sha256 = "0ql05yxq3k8sywncaz3cf3xaihf4pd0ijn139ms8snyps36k6l8h"; libraryHaskellDepends = [ - aeson base classy-prelude http-conduit yesod-core yesod-form + aeson base http-conduit string-transform text yesod-core yesod-form ]; description = "yesod recaptcha2"; license = lib.licenses.mit; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 5d178e3b5a1..b79aace9e3b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -348,7 +348,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # ); # }); # in - # hpkgs.shellFor { + # haskellPkgs.shellFor { # packages = p: [ p.foo ]; # genericBuilderArgsModifier = args: args // { doCheck = true; doBenchmark = true }; # } diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 30134a05628..f700eb163a9 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -236,9 +236,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "5"; }; - sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n"; + sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; @@ -247,15 +247,15 @@ in { inherit (darwin.apple_sdk.frameworks) Security; }; - pypy36 = callPackage ./pypy { - self = pypy36; + pypy37 = callPackage ./pypy { + self = pypy37; sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "5"; }; - sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2"; - pythonVersion = "3.6"; + sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI="; + pythonVersion = "3.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; inherit passthruFun; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index a5ba4983e43..668a4e24b39 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -73,6 +73,8 @@ in with passthru; stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ + ./dont_fetch_vendored_deps.patch + (substituteAll { src = ./tk_tcl_paths.patch; inherit tk tcl; @@ -81,12 +83,18 @@ in with passthru; stdenv.mkDerivation rec { tk_libprefix = tk.libPrefix; tcl_libprefix = tcl.libPrefix; }) + + (substituteAll { + src = ./sqlite_paths.patch; + inherit (sqlite) out dev; + }) ]; postPatch = '' - substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + substituteInPlace lib_pypy/pypy_tools/build_cffi_imports.py \ + --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; buildPhase = '' diff --git a/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch new file mode 100644 index 00000000000..bc959e15d1a --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py +--- a/lib_pypy/pypy_tools/build_cffi_imports.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/pypy_tools/build_cffi_imports.py 2021-07-16 06:37:03.000000000 -0400 +@@ -225,6 +225,8 @@ + + print('*', ' '.join(args), file=sys.stderr) + if embed_dependencies and key in cffi_dependencies: ++ print("Nixpkgs: skipping fetching/building dependency", key) ++ elif False: + status, stdout, stderr = _build_dependency(key) + if status != 0: + failures.append((key, module)) diff --git a/pkgs/development/interpreters/python/pypy/sqlite_paths.patch b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch new file mode 100644 index 00000000000..42de7efb3ea --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py +--- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400 +@@ -301,6 +301,8 @@ + else: + extra_args = dict( + libraries=libraries, ++ include_dirs=['@dev@/include'], ++ library_dirs=['@out@/lib'] + ) + + SOURCE = """ diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 3863b97d6b1..ba132acf722 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index cf2ca1b766e..6f089e51221 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,24 +1,18 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "rubygems"; - version = "3.2.16"; + version = "3.2.24"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "1bpn45hchcbirqvqwxcxyk1xy2xkdd915jci2hfjq4y6zc4idns0"; + sha256 = "09ff830a043y6s7390hsg3k55ffpifb1zsvs0dhz8z8pypwgiscl"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch - # Ensure tmp directory are not left behind - # https://github.com/rubygems/rubygems/pull/4610 - (fetchpatch { - url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch"; - sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms="; - }) ]; installPhase = '' diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index f867e606140..420c3d72f89 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -14,6 +14,15 @@ in stdenv.mkDerivation rec { sha256 = "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f"; }; + patches = [ + # Backport a change from Firefox 75 that fixes finding the + # location of clang and libclang. + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da"; + sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0"; + }) + ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; # Configure script only understands --includedir @@ -55,9 +64,6 @@ in stdenv.mkDerivation rec { "--with-system-zlib" "--with-system-icu" - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" - "--with-clang-path=${llvmPackages.clang}/bin/clang" - "--enable-shared-js" "--enable-readline" # Fedora and Arch disable optimize, but it doesn't seme to be necessary @@ -90,6 +96,7 @@ in stdenv.mkDerivation rec { homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; + badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 3ca359b3da5..d8356056812 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.2.2"; + version = "5.3"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-DeTJAAY3OEu+pVazt5es1v3l1nGAfjvE0wQmYISRYoo="; + sha256 = "sha256-ogY47Ggtj9k2U5pop1DNFkTusgQi2nNLc5OGN45SBCk="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index b77c9044834..99cb863a598 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "1smvnid7r1mc4lp34pfrbzgzrcl0gmw0dlkga8z0r3g2zhj98lz1"; + sha256 = "14h3jprm6924g9576v25axn9v6xnip354hvpzlcqsc5qqyj7zzjs"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; @@ -16,7 +16,7 @@ mkDerivation rec { runhaskell GenerateEverything.hs # We will only build/consider Everything.agda, in particular we don't want Everything*.agda # do be copied to the store. - rm EverythingSafe.agda EverythingSafeGuardedness.agda EverythingSafeSizedTypes.agda + rm EverythingSafe.agda ''; passthru.tests = { inherit (nixosTests) agda; }; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 33b253718a7..bb987d069a7 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation { patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; + # For currently unknown reason, `-fPIC` has to be passed explicitly, otherwise + # downstream software like `elfutils` will get `recompile errors like: + # libargp.a(argp-help.o): relocation R_X86_64_PC32 against symbol `program_invocation_short_name' can not be used when making a shared object; recompile with -fPIC + # It seems that nixpkgs's on-by-default `-fPIC` is not in effect here. + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline -fPIC'"; postInstall = '' mkdir -p $out/lib $out/include diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 83e63abb3c6..15785d25fe2 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U="; + sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d"; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 91339380424..283c815b199 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,24 +1,65 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: +{ lib +, cmake +, fetchFromGitHub +, fetchpatch +, lz4 +, pkg-config +, python3 +, stdenv +, unzip +, enablePython ? false +}: -stdenv.mkDerivation { - name = "flann-1.9.1"; +stdenv.mkDerivation rec { + pname = "flann"; + version = "1.9.1"; src = fetchFromGitHub { - owner = "mariusmuja"; + owner = "flann-lib"; repo = "flann"; - rev = "1.9.1"; + rev = version; sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; patches = [ - # Upstream issue: https://github.com/mariusmuja/flann/issues/369 + # Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS. (fetchpatch { - url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch"; - sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4"; + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch"; + sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk="; + }) + # Patch no-source library workaround that breaks on CMake > 3.11. + (fetchpatch { + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch"; + sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4="; + }) + # Avoid the bundled version of LZ4 and instead use the system one. + (fetchpatch { + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch"; + sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg="; + }) + # Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480 + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; + sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) ]; - nativeBuildInputs = [ unzip cmake python ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES:BOOL=OFF" + "-DBUILD_TESTS:BOOL=OFF" + "-DBUILD_MATLAB_BINDINGS:BOOL=OFF" + "-DBUILD_PYTHON_BINDINGS:BOOL=${if enablePython then "ON" else "OFF"}" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; + + propagatedBuildInputs = [ lz4 ]; + + buildInputs = lib.optionals enablePython [ python3 ]; meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 38926f298d4..2a430844ebe 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -1,52 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi -, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng -, libtiff, freetype, Cocoa, AGL, GLUT -}: - -let - version = "1.4.x-r13121"; -in - -stdenv.mkDerivation { - pname = "fltk"; - inherit version; - - src = fetchurl { - url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; - sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; - }; - - patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ freetype libtiff ] - else [ xlibsWrapper libXi freeglut ]); - - configureFlags = [ - "--enable-gl" - "--enable-largefile" - "--enable-shared" - "--enable-threads" - "--enable-xft" - ]; - - preConfigure = '' - make clean - rm VERSION - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A C++ cross-platform lightweight GUI library"; - homepage = "https://www.fltk.org"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; - }; - +import ./common.nix rec { + version = "1.4.x-2021-07-04"; + rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d"; + sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim"; } diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix new file mode 100644 index 00000000000..06e1c05c7d0 --- /dev/null +++ b/pkgs/development/libraries/fltk/common.nix @@ -0,0 +1,205 @@ +{ version, rev, sha256 }: + +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, zlib +, libjpeg +, libpng +, fontconfig +, freetype +, libX11 +, libXext +, libXinerama +, libXfixes +, libXcursor +, libXft +, libXrender +, ApplicationServices +, Carbon +, Cocoa + +, withGL ? true +, libGL +, libGLU +, glew +, OpenGL + +, withCairo ? true +, cairo + +, withPango ? (lib.strings.versionAtLeast version "1.4" && stdenv.hostPlatform.isLinux) +, pango + +, withDocs ? true +, doxygen +, graphviz +, texlive + +, withExamples ? true +, withShared ? true +}: + +let + onOff = value: if value then "ON" else "OFF"; + tex = texlive.combine { + inherit (texlive) + scheme-medium varwidth multirow hanging adjustbox collectbox stackengine + sectsty tocloft newunicodechar etoc; + }; +in +stdenv.mkDerivation rec { + pname = "fltk"; + inherit version; + + src = fetchFromGitHub { + owner = "fltk"; + repo = "fltk"; + inherit rev sha256; + }; + + outputs = [ "out" ] + ++ lib.optional withExamples "bin" + ++ lib.optional withDocs "doc"; + + # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries + outputBin = lib.optionalString withExamples "out"; + + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + ./nsosv.patch + ]; + + postPatch = '' + patchShebangs documentation/make_* + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals withDocs [ + doxygen + graphviz + tex + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + ApplicationServices + Carbon + ] ++ lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [ + libGL + libGLU + ] ++ lib.optionals (withExamples && withGL) [ + glew + ]; + + propagatedBuildInputs = [ + zlib + libjpeg + libpng + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + freetype + fontconfig + libX11 + libXext + libXinerama + libXfixes + libXcursor + libXft + libXrender + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ] ++ lib.optionals (withGL && stdenv.hostPlatform.isDarwin) [ + OpenGL + ] ++ lib.optionals withCairo [ + cairo + ] ++ lib.optionals withPango [ + pango + ]; + + cmakeFlags = [ + # Common + "-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}" + "-DOPTION_USE_SYSTEM_ZLIB=ON" + "-DOPTION_USE_SYSTEM_LIBJPEG=ON" + "-DOPTION_USE_SYSTEM_LIBPNG=ON" + + # X11 + "-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}" + "-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}" + + # GL + "-DOPTION_USE_GL=${onOff withGL}" + "-DOpenGL_GL_PREFERENCE=GLVND" + + # Cairo + "-DOPTION_CAIRO=${onOff withCairo}" + "-DOPTION_CAIROEXT=${onOff withCairo}" + + # Pango + "-DOPTION_USE_PANGO=${onOff withPango}" + + # Examples & Tests + "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}" + + # Docs + "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}" + "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" + ]; + + preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' + # unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250 + export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup" + ''; + + postBuild = lib.optionalString withDocs '' + make docs + ''; + + postInstall = lib.optionalString withExamples '' + mkdir -p $bin/bin + mv bin/{test,examples}/* $bin/bin/ + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Library/Frameworks + mv $out{,/Library/Frameworks}/FLTK.framework + + moveAppBundles() { + echo "Moving and symlinking $1" + appname="$(basename "$1")" + binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")" + curpath="$(dirname "$1")" + + mkdir -p "$curpath"/../Applications/ + mv "$1" "$curpath"/../Applications/ + [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname" + ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname" + } + + rm $out/bin/fluid.icns + for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do + moveAppBundles "$app" + done + ''; + + postFixup = '' + substituteInPlace $out/bin/fltk-config \ + --replace "/$out/" "/" + ''; + + meta = with lib; { + description = "A C++ cross-platform lightweight GUI library"; + homepage = "https://www.fltk.org"; + platforms = platforms.unix; + # LGPL2 with static linking exception + # https://www.fltk.org/COPYING.php + license = licenses.lgpl2Only; + }; +} diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 5cbd993fc64..831a96f71f3 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,46 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi -, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng -, libtiff, freetype, Cocoa, AGL, GLUT -}: - -let - version = "1.3.5"; -in - -stdenv.mkDerivation { - pname = "fltk"; - inherit version; - - src = fetchurl { - url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; - sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; - }; - - patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ] - ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ]; - - propagatedBuildInputs = [ xorgproto ] - ++ (if stdenv.isDarwin - then [ freetype libtiff ] - else [ xlibsWrapper libXi freeglut ]); - - configureFlags = [ - "--enable-gl" - "--enable-largefile" - "--enable-shared" - "--enable-threads" - "--enable-xft" - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "A C++ cross-platform lightweight GUI library"; - homepage = "https://www.fltk.org"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; - }; +import ./common.nix rec { + version = "1.3.6"; + rev = "release-${version}"; + sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv"; } diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index b123f799cca..f963ae31e5c 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { ./no-sys-dirs.patch (fetchpatch { name = "siginfo.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/siginfo.patch"; sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j"; extraPrefix = ""; }) (fetchpatch { name = "gcc-3.4.3-no_multilib_amd64.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/gcc-3.4.3-no_multilib_amd64.patch"; sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm"; extraPrefix = ""; }) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 37c15225869..f9089384a8a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Cocoa, Kernel, fixDarwinDylibNames +, waylandSupport ? false, extra-cmake-modules, wayland +, wayland-protocols, libxkbcommon }: stdenv.mkDerivation rec { @@ -14,20 +16,34 @@ stdenv.mkDerivation rec { sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw="; }; + patches = lib.optional waylandSupport ./wayland.patch; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional waylandSupport extra-cmake-modules; - buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; + buildInputs = + if waylandSupport + then [ wayland wayland-protocols libxkbcommon ] + else [ libX11 libXrandr libXinerama libXcursor libXi libXext ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optional (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" + ] ++ lib.optionals waylandSupport [ + "-DGLFW_USE_WAYLAND=ON" + "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" ]; + postPatch = lib.optionalString waylandSupport '' + substituteInPlace src/wl_init.c \ + --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + ''; + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; diff --git a/pkgs/development/libraries/glfw/wayland.patch b/pkgs/development/libraries/glfw/wayland.patch new file mode 100644 index 00000000000..c0c338f845b --- /dev/null +++ b/pkgs/development/libraries/glfw/wayland.patch @@ -0,0 +1,25 @@ +From 46fb81c69e8acdb70907409f98dd01e387408414 Mon Sep 17 00:00:00 2001 +From: Stone Tickle <lattis@mochiro.moe> +Date: Fri, 5 Jun 2020 12:51:25 +0900 +Subject: [PATCH] set O_NONBLOCK on repeat timerfd + +--- + src/wl_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wl_init.c b/src/wl_init.c +index 49e7cc52..43569bef 100644 +--- a/src/wl_init.c ++++ b/src/wl_init.c +@@ -1166,7 +1166,7 @@ int _glfwPlatformInit(void) + + _glfw.wl.timerfd = -1; + if (_glfw.wl.seatVersion >= 4) +- _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); ++ _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); + + if (_glfw.wl.pointer && _glfw.wl.shm) + { +-- +2.31.1 + diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix new file mode 100644 index 00000000000..f6f909904cf --- /dev/null +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + pname = "commons-daemon"; + + src = fetchurl { + url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; + sha256 = "0bsy4xn3gncgrxj3vkpplvyhx06c1470kycj0j5gwq46ylgady9s"; + }; + + installPhase = '' + tar xf ${src} + mkdir -p $out/share/java + cp *.jar $out/share/java/ + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-daemon"; + description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; + maintainers = with lib.maintainers; [ rsynnest ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index e6f2fcadbe7..da1e6120da6 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, unzip, jre }: +{ lib, stdenv, fetchurl, unzip, jre, jre8 }: let - common = { pname, version, src, description + common = { pname, version, src, description, java ? jre , prog ? null, jar ? null, license ? lib.licenses.mpl20 }: stdenv.mkDerivation { name = "${pname}-${version}"; @@ -45,6 +45,7 @@ in { description = "XSLT 1.0 processor"; # http://saxon.sourceforge.net/saxon6.5.3/conditions.html license = lib.licenses.mpl10; + java = jre8; }; saxonb_8_8 = common { @@ -56,6 +57,7 @@ in { sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; + java = jre8; }; saxonb_9_1 = common { diff --git a/pkgs/development/libraries/kcolorpicker/default.nix b/pkgs/development/libraries/kcolorpicker/default.nix new file mode 100644 index 00000000000..75a07b17a7e --- /dev/null +++ b/pkgs/development/libraries/kcolorpicker/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }: + +mkDerivation rec { + pname = "kcolorpicker"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "kColorPicker"; + rev = "v${version}"; + sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "Qt based Color Picker with popup menu"; + homepage = "https://github.com/ksnip/kColorPicker"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fliegendewurst ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 4ad3ba74100..00a9ef015f2 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -15,10 +15,19 @@ mkDerivation { url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff"; sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig"; }) + (fetchpatch { # included in kimageformats >= 5.82 + name = "CVE-2021-36083.patch"; + url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff"; + sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml"; + }) ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr libavif qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; + + meta = with lib; { + broken = versionOlder qtbase.version "5.14"; + }; } diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix new file mode 100644 index 00000000000..3188415ea04 --- /dev/null +++ b/pkgs/development/libraries/kimageannotator/default.nix @@ -0,0 +1,24 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }: + +mkDerivation rec { + pname = "kimageannotator"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "kImageAnnotator"; + rev = "v${version}"; + sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ qtbase kcolorpicker ]; + + meta = with lib; { + description = "Tool for annotating images"; + homepage = "https://github.com/ksnip/kImageAnnotator"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fliegendewurst ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 10d688d89b6..d94a0e1d78b 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; - configureFlags = lib.optional stdenv.targetPlatform.isWindows "--disable-examples"; + configureFlags = lib.optional (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"; meta = with lib; { homepage = "http://www.hyperrealm.com/libconfig"; diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/development/libraries/libgnt/default.nix new file mode 100644 index 00000000000..33ce7fbaa11 --- /dev/null +++ b/pkgs/development/libraries/libgnt/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config +, gtk-doc, docbook-xsl-nons +, glib, ncurses, libxml2 +, buildDocs ? true +}: +stdenv.mkDerivation rec { + pname = "libgnt"; + version = "2.14.1"; + + outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc"; + + src = fetchurl { + url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz"; + sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ] + ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ]; + + buildInputs = [ glib ncurses libxml2 ]; + + postPatch = '' + substituteInPlace meson.build --replace \ + "ncurses_sys_prefix = '/usr'" \ + "ncurses_sys_prefix = '${lib.getDev ncurses}'" + '' + lib.optionalString (!buildDocs) '' + sed "/^subdir('doc')$/d" -i meson.build + ''; + + meta = with lib; { + description = "An ncurses toolkit for creating text-mode graphical user interfaces"; + homepage = "https://keep.imfreedom.org/libgnt/libgnt/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with lib.maintainers; [ ony ]; + }; +} diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index afe5b8dde13..c5d6bc4612f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -5,6 +5,7 @@ , zlib , dbus , networkmanager +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68 , spidermonkey_68 , pcre , gsettings-desktop-schemas @@ -16,7 +17,9 @@ , JavaScriptCore }: -stdenv.mkDerivation rec { +let + jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68; +in stdenv.mkDerivation rec { pname = "libproxy"; version = "0.4.17"; @@ -39,22 +42,21 @@ stdenv.mkDerivation rec { pcre python3 zlib + ] ++ lib.optionals enableJavaScript [ + jsRuntime ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation - JavaScriptCore ] else [ glib - spidermonkey_68 dbus networkmanager ]); cmakeFlags = [ - "-DWITH_MOZJS=ON" "-DWITH_PYTHON2=OFF" "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" - ]; + ] ++ lib.optional (enableJavaScript && !stdenv.hostPlatform.isDarwin) "-DWITH_MOZJS=ON"; postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c62aa77c61a..7d8355112db 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -20,6 +20,8 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" + # Required since v4.2.0 + "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; @@ -52,13 +54,8 @@ rec { sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets_4_0 = generic { - version = "4.0.21"; - sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; - }; - - libwebsockets_4_1 = generic { - version = "4.1.6"; - sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; + libwebsockets_4_2 = generic { + version = "4.2.0"; + sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaa78de47f7..725451da943 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -220,6 +220,7 @@ self = stdenv.mkDerivation { passthru = { inherit libdrm; inherit (libglvnd) driverLink; + inherit llvmPackages; tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-dev-does-not-depend-on-llvm"; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 7a6bbb55202..fe0049c1f38 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { (fetchurl { # 2020-06-19: NOTE: # Fix build with C++11 # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed. - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) ] ++ lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index df7ce6fd4b1..8947c6f4239 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , autoPatchelfHook , fixDarwinDylibNames @@ -17,7 +18,7 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; # assemble list of components - components = [ "basic" "sdk" "sqlplus" ] ++ optional odbcSupport "odbc"; + components = [ "basic" "sdk" "sqlplus" "tools" ] ++ optional odbcSupport "odbc"; # determine the version number, there might be different ones per architecture version = { @@ -28,22 +29,23 @@ let # hashes per component and architecture hashes = { x86_64-linux = { - basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; - sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; + basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; + sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; - odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; + tools = "1q19blr0gz1c8bq0bnv1njzflrp03hf82ngid966xc6gwmqpkdsk"; + odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; }; x86_64-darwin = { - basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; - sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; + basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; + sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e"; - odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; + tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c"; + odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; }; }.${stdenv.hostPlatform.system} or throwSystem; # rels per component and architecture, optional - rels = { - }.${stdenv.hostPlatform.system} or {}; + rels = { }.${stdenv.hostPlatform.system} or { }; # convert platform to oracle architecture names arch = { @@ -70,13 +72,15 @@ let }; # assemble srcs - srcs = map (component: - (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")) - components; + srcs = map + (component: + (fetcher (srcFilename component arch version rels.${component} or "") hashes.${component} or "")) + components; pname = "oracle-instantclient"; extLib = stdenv.hostPlatform.extensions.sharedLibrary; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit pname version srcs; buildInputs = [ stdenv.cc.cc.lib ] @@ -87,13 +91,13 @@ in stdenv.mkDerivation { ++ optional stdenv.isLinux autoPatchelfHook ++ optional stdenv.isDarwin fixDarwinDylibNames; - outputs = [ "out" "dev" "lib"]; + outputs = [ "out" "dev" "lib" ]; unpackCmd = "unzip $curSrc"; installPhase = '' mkdir -p "$out/"{bin,include,lib,"share/java","share/${pname}-${version}/demo/"} $lib/lib - install -Dm755 {adrci,genezi,uidrvci,sqlplus} $out/bin + install -Dm755 {adrci,genezi,uidrvci,sqlplus,exp,expdp,imp,impdp} $out/bin # cp to preserve symlinks cp -P *${extLib}* $lib/lib @@ -124,6 +128,6 @@ in stdenv.mkDerivation { license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix index 032b67e683d..4eb18c347c0 100644 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/orocos_kdl"; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen ]; + propagatedBuildInputs = [ eigen ]; meta = with lib; { description = "Kinematics and Dynamics Library"; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index d4b98d57e11..629066d23a4 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-jKrazCyWmIPNH5lLYieV/IhftLFdrYyK5kvL2/DL1H0="; + sha256 = "sha256-4Ij8z9GmwvjhCJ9FcQG+4eXHqXd+nVHGQZyKKIpJ4bs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index efa68146e8d..840c9e773f4 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,32 +1,32 @@ -{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2 -, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: - -stdenv.mkDerivation { - name = "portaudio-190600-20161030"; +{ lib +, stdenv +, fetchurl +, alsa-lib +, pkg-config +, AudioUnit +, AudioToolbox +, CoreAudio +, CoreServices +, Carbon }: + +stdenv.mkDerivation rec { + pname = "portaudio"; + version = "190700_20210406"; src = fetchurl { - url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"; - sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; + url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjack2 ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib; + buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - patchPhase = lib.optionalString stdenv.isDarwin '' - sed -i '50 i\ - #include <CoreAudio/AudioHardware.h>\ - #include <CoreAudio/AudioHardwareBase.h>\ - #include <CoreAudio/AudioHardwareDeprecated.h>' \ - include/pa_mac_core.h - ''; - # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index fcb6297f519..77b8c3f525a 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -85,7 +85,7 @@ let # https://bugreports.qt.io/browse/QTBUG-77037 (fetchpatch { name = "fix-build-with-pulseaudio-13.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/fc77d6b3d5ec74e421b58f199efceb2593cbf951/trunk/qtbug-77037-workaround.patch"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 95034c3637a..3f0cf45062f 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "c++11.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) ] ++ lib.optional stdenv.isDarwin diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index f06a028fe64..ee495deedc1 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,4 +1,20 @@ -{ lib, stdenv , darwin , fetchurl , blas , gfortran , lapack , python }: +{ lib +, stdenv +, fetchurl +, darwin +, gfortran +, python3 +, blas +, lapack +, mpi # generic mpi dependency +, openssh # required for openmpi tests +, petsc-withp4est ? true +, p4est +, zlib # propagated by p4est but required by petsc +}: + +# This version of PETSc does not support a non-MPI p4est build +assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; @@ -9,44 +25,53 @@ stdenv.mkDerivation rec { sha256 = "04vy3qyakikslc58qyv8c9qrwlivix3w6znc993i37cvfg99dch9"; }; - nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; - - # Upstream does some hot she-py-bang stuff, this change streamlines that - # process. The original script in upstream is both a shell script and a - # python script, where the shellscript just finds a suitable python - # interpreter to execute the python script. See - # https://github.com/NixOS/nixpkgs/pull/89299#discussion_r450203444 - # for more details. - prePatch = '' - substituteInPlace configure \ - --replace /bin/sh /usr/bin/python - '' + lib.optionalString stdenv.isDarwin '' + mpiSupport = !withp4est || p4est.mpiSupport; + withp4est = petsc-withp4est; + + nativeBuildInputs = [ python3 gfortran ]; + buildInputs = [ blas lapack ] + ++ lib.optional mpiSupport mpi + ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh + ++ lib.optional withp4est p4est + ; + + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool ''; preConfigure = '' export FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" - patchShebangs . + patchShebangs ./lib/petsc/bin configureFlagsArray=( $configureFlagsArray - "--CC=$CC" - "--with-cxx=$CXX" - "--with-fc=$FC" - "--with-mpi=0" - "--with-blas-lib=[${blas}/lib/libblas.so,${gfortran.cc.lib}/lib/libgfortran.a]" - "--with-lapack-lib=[${lapack}/lib/liblapack.so,${gfortran.cc.lib}/lib/libgfortran.a]" + ${if !mpiSupport then '' + "--with-mpi=0" + '' else '' + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + "--with-mpi=1" + ''} + ${if withp4est then '' + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=-L${zlib}/lib -lz" + '' else ""} + "--with-blas=1" + "--with-lapack=1" ) ''; + configureScript = "python ./configure"; + + enableParallelBuilding = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + meta = with lib; { - description = '' - Library of linear algebra algorithms for solving partial differential - equations - ''; + description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://www.mcs.anl.gov/petsc/index.html"; license = licenses.bsd2; - maintainers = with maintainers; [ wucke13 ]; - platforms = platforms.all; + maintainers = with maintainers; [ wucke13 cburstedde ]; }; } diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix new file mode 100644 index 00000000000..bd406d63245 --- /dev/null +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tezos-rust-libs"; + version = "1.0"; + + src = fetchFromGitLab { + owner = "tezos"; + repo = "tezos-rust-libs"; + rev = "v${version}"; + sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5"; + }; + + cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx"; + + preBuild = '' + mkdir .cargo + mv cargo-config .cargo/config + ''; + + postInstall = '' + mkdir $out/lib/tezos-rust-libs + cp -r rustc-bls12-381/include $out/include + cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs + cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs + ''; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/tezos/tezos-rust-libs"; + description = "Tezos: all rust dependencies and their dependencies"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4635a80152d..4c21eb27422 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; + sha256 = "1w9gs9cq2yhj5s3diz3x1l15pgrc1pbm00jccizvcjyibmwyyf2h"; }; # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 19fff0c71f7..daa97bfddde 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -35,6 +35,24 @@ let ''; }; + hyperspace-cli = super."@hyperspace/cli".override { + nativeBuildInputs = with pkgs; [ + makeWrapper + libtool + autoconf + automake + ]; + buildInputs = with pkgs; [ + nodePackages.node-gyp-build + nodejs + ]; + postInstall = '' + wrapProgram "$out/bin/hyp" --prefix PATH : ${ + pkgs.lib.makeBinPath [ pkgs.nodejs ] + } + ''; + }; + coc-imselect = super.coc-imselect.override { meta.broken = since "10"; }; @@ -107,6 +125,19 @@ let nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ]; }); + jsonplaceholder = super.jsonplaceholder.override (drv: { + buildInputs = [ nodejs ]; + postInstall = '' + exe=$out/bin/jsonplaceholder + mkdir -p $out/bin + cat >$exe <<EOF + #!${pkgs.runtimeShell} + exec -a jsonplaceholder ${nodejs}/bin/node $out/lib/node_modules/jsonplaceholder/index.js + EOF + chmod a+x $exe + ''; + }); + makam = super.makam.override { buildInputs = [ pkgs.nodejs pkgs.makeWrapper ]; postFixup = '' @@ -202,6 +233,15 @@ let ''; }; + postcss-cli = super.postcss-cli.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/postcss" \ + --prefix NODE_PATH : ${self.postcss}/lib/node_modules + ''; + meta.mainProgram = "postcss"; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; @@ -268,7 +308,7 @@ let }; teck-programmer = super.teck-programmer.override { - buildInputs = [ pkgs.libusb ]; + buildInputs = [ pkgs.libusb1 ]; }; vega-cli = super.vega-cli.override { diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index e7a15d5d869..b58c71a088c 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -3,7 +3,7 @@ set -eu -o pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" node2nix=$(nix-build ../../.. -A nodePackages.node2nix) -cd ${DIR} +cd "$DIR" rm -f ./node-env.nix ${node2nix}/bin/node2nix -i node-packages.json -o node-packages.nix -c composition.nix # using --no-out-link in nix-build argument would cause the diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 95f2527711b..d8136523f91 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -3,6 +3,7 @@ , "@antora/cli" , "@antora/site-generator-default" , "@bitwarden/cli" +, "@hyperspace/cli" , "@nestjs/cli" , "@vue/cli" , "@webassemblyjs/cli" @@ -139,6 +140,7 @@ , "json-refs" , "json-server" , "jsonlint" +, "jsonplaceholder" , "kaput-cli" , "katex" , "karma" @@ -186,6 +188,7 @@ , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" +, "postcss" , "postcss-cli" , "prettier" , "prettier-plugin-toml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index ac6f8d7d90f..8c71d806d00 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.1" = { + "@angular-devkit/architect-0.1201.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.1"; + version = "0.1201.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz"; - sha512 = "n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.2.tgz"; + sha512 = "hR5kI03WoeEY9dkAsQNLlhL1iEFC2L77ansaKquN+HCAeOGHby4w95suSlZUAg0r6ZhPhPH0tkIRZXU9NMa09g=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -76,6 +76,15 @@ let sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; }; }; + "@angular-devkit/core-12.1.2" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "12.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.2.tgz"; + sha512 = "TeaRbvsNEeAkRJcIBlT6yUNh0vaVVBGBYfXYFIMg/I04ex/HI0ApEowu78GeTzCqlE0r4t+WaGT46m7+NIljKg=="; + }; + }; "@angular-devkit/schematics-12.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -94,6 +103,15 @@ let sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; }; }; + "@angular-devkit/schematics-12.1.2" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "12.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.2.tgz"; + sha512 = "/UGcAJChq+g7wf46Exr5iIyuVw3j4TxTIntTpuKg/z/xf9Y+8mzJAZgGittu/yFcHAJ9aYcOHctffrfEdV7QSA=="; + }; + }; "@angular-devkit/schematics-cli-12.1.1" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -1642,6 +1660,15 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; + "@corestore/networker-1.1.0" = { + name = "_at_corestore_slash_networker"; + packageName = "@corestore/networker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.1.0.tgz"; + sha512 = "Pj5Cfyfck1OJfVd4diO4UVo8qabW9O/wgDz5HeY6Okuan98KjMxrAJZG8MPk7I+mjRoYDFgFPVgssx9zv420Ag=="; + }; + }; "@cronvel/get-pixels-3.4.0" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; @@ -2245,13 +2272,13 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/date-time-utilities-8.2.0" = { + "@fluentui/date-time-utilities-8.2.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.0.tgz"; - sha512 = "OunpRZ8hyDPLNWwrx8w17eUwGdNYjG4kGR9+jzvQQJjswk94KMxc6SY33mlTLVEbagjdHMHw9jR7STS+JCQNcA=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.1.tgz"; + sha512 = "0AYXaXFQ3bPsOtiOi3bJSihzf+w3L44iQK38EiQgp3uAXei/i36VtDCToHZehYV+eS4s1qb/QGksoL0F4G6WCQ=="; }; }; "@fluentui/dom-utilities-1.1.2" = { @@ -2263,31 +2290,31 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/dom-utilities-2.1.2" = { + "@fluentui/dom-utilities-2.1.3" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.2.tgz"; - sha512 = "9LxI3iLbBkyoudRyk0nPTjMdMB2+ClDfM8V3A0SM82e5cDss5qlo0fog/2T2aoaon+hwfeinpiY4e3znx+Nn0w=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.3.tgz"; + sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; }; }; - "@fluentui/font-icons-mdl2-8.1.4" = { + "@fluentui/font-icons-mdl2-8.1.6" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.4"; + version = "8.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.4.tgz"; - sha512 = "v0NRk+W2qJQtBsH9hqYNG5Xnic8C1kfB0I+OTGasFYPvxdd0APcWw2vajrlE49ijgVjXS0AByCgF6mu8LiYlHg=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.6.tgz"; + sha512 = "tNAaX72NQYbvR9zeiOiVQBQhYtVgPUgh68LKTGywuYGc2WffBu20Xk9wII8iLGmAijLI1QClaCQxaRAL0IkfBA=="; }; }; - "@fluentui/foundation-legacy-8.1.4" = { + "@fluentui/foundation-legacy-8.1.6" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.4"; + version = "8.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.4.tgz"; - sha512 = "Kd+XpHsv3UEnDTwEnUm93Au+QGpYZ5x/VuQsv8K1sDM+gjb3BDohuwR6MWgzgCMJiVW0NMlbS4I2OpUZa6k5eg=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.6.tgz"; + sha512 = "TJzUFcpfcJefXNmTOAJBKgIlQXDPw/dIcpO9l2nBfORvy4RnrJK4QjpdJPp5XOhDPtDVjlKPB1WvavoRkPRrbg=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2299,31 +2326,31 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/keyboard-key-0.3.2" = { + "@fluentui/keyboard-key-0.3.3" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.2.tgz"; - sha512 = "Hjes+WUgVRqikyvmBEuyovw89inYZ1qVmdp4kKi/6BGvQlAcHgGIVfmdnlFumP4lmFpBW8uUh2K1ZmfY0xwQ6Q=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.3.tgz"; + sha512 = "3qX1WNCgJlKq7uGH76rLC4cdESgwdLhMH9WjcQUkQNJKtBpL4vs5O99M1keEhd3pfooW7zasr6AcYcWq4BRB4g=="; }; }; - "@fluentui/merge-styles-8.1.2" = { + "@fluentui/merge-styles-8.1.3" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.2.tgz"; - sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.3.tgz"; + sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; }; }; - "@fluentui/react-7.172.4" = { + "@fluentui/react-7.173.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.172.4"; + version = "7.173.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.4.tgz"; - sha512 = "eFmw1npSTj/6JeP99KltrRIThqilU2HpOmddwmMA77wwt9GjgxUZm1igfTyyfd3RbuqfLgHGK9OhFqAH5Eo9wg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.1.tgz"; + sha512 = "+6PB+CwwL2GNHy4GrDR6871ng7A7FRGXSHQzGqfeLq7Dr7vjO82fGuIsrIaFO1Ry1lug6c41uC5Bon/mKcs1KQ=="; }; }; "@fluentui/react-8.22.0" = { @@ -2344,22 +2371,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.5" = { + "@fluentui/react-focus-8.1.8" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.5"; + version = "8.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.5.tgz"; - sha512 = "zvHwta+lRmw2kYRif0Zz6+skmfxUzagd15iMlUPRIVAcsj+rxOkoE7g8NlhXym7HsgMiKRAYJM0CdfMauCnkvQ=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.8.tgz"; + sha512 = "EUI1TZwM7T2keNEjqIAkeV9ALMlLjz7abqHk0AypKJG3v4YPQHycal37KAHQb+gdVJX2hjVQLxynI1yrquKFUw=="; }; }; - "@fluentui/react-hooks-8.2.3" = { + "@fluentui/react-hooks-8.2.4" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.3"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.3.tgz"; - sha512 = "JqQNLIc0WOwwMZ3rAnBkcy0oHZD83Bi1hs7qpvwGUW1OrL3QoJqEnmiKPowxWb8NUeKEP51cBfGi+/7aqbDZAg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.4.tgz"; + sha512 = "qc/j0YdxC0zAWVqh8BJppZuK3o9/rfyu5psY4N/AL9dmKrTFWszRgTSB5uiRShN99L88UUEV9RtlfknnLDGrUg=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2371,31 +2398,31 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/react-window-provider-2.1.2" = { + "@fluentui/react-window-provider-2.1.3" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.2.tgz"; - sha512 = "VWtesIAZR5fdlZMwYco/M5EBb3jawUkslQYOKsneNq+mq8ThkUs1Bol5bpK6jwmouROscu76HD1QfjdACAfkLQ=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.3.tgz"; + sha512 = "3NWL3Kkqp3elD/aTrUaEufRUrN7K7hYsXEsOY2bDCDjPadLGtZlTGWNYFbUYNsaL/v79gZHhH+voCECP85HqRg=="; }; }; - "@fluentui/set-version-8.1.2" = { + "@fluentui/set-version-8.1.3" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.2.tgz"; - sha512 = "uCPwdBsahBbLuN8UkbmXtp+u8Gxqtm5+fZ1UuOUBhEL7MKl86LrWmxoy4IW3JD2rcbaYpCb7KFpnMB5s0Nx0ZA=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.3.tgz"; + sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; }; }; - "@fluentui/style-utilities-8.1.4" = { + "@fluentui/style-utilities-8.2.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.1.4"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.4.tgz"; - sha512 = "tR/ntfobJvuCtLyi7jpEbsq67iTaBNq/lpq+tYuvIqI8Gl90L9a8g8344ADP4+9/i3TKsrAZgnV9vze66ybHOw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.0.tgz"; + sha512 = "gdAgBnevDOHbgqAKCaQG4CXN6dONMg8BRSZNqha0I9WdgLJy7F7t4xVo8elPjlDUP72ciYT8J9Z/YNljZzbE0w=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2407,22 +2434,22 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.1.3" = { + "@fluentui/theme-2.1.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.3.tgz"; - sha512 = "o/So4091GtwtEkxujd6QT9M8kuLOde0Z7by/zLNQBU00wX3PeBxM4mpSLmnz2vt5CN5IT7OWhRRsiyve/7hLAg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.4.tgz"; + sha512 = "Y4FWgnYldvAFOo24tfsREMb8/3Tn5uDoYgGO7AAdrksP7VAaavaEVQCOgvHWy3l89Bsxf00/fE+QJ/AHv5Z4CA=="; }; }; - "@fluentui/utilities-8.2.0" = { + "@fluentui/utilities-8.2.1" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.0.tgz"; - sha512 = "kq8xyFHkWUbzzbkGLuDACEhH+K5oqM/wEU9+zRuM/qI2bIS1B6Cr0ruq7FHxVrtAnMhvXKzM8DPn0W8uf775qQ=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.1.tgz"; + sha512 = "ezRkBUDhHQjrqAWA6H1TwWU3STauW/EjthDAe/upJbmXeP3ynn7tTpx1gpNi/vHjJlRkO1JjNoiSc6P4MZWkYw=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -2461,13 +2488,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.15.1" = { + "@google-cloud/pubsub-2.16.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.15.1"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.15.1.tgz"; - sha512 = "avBYmN1n9BsY8RzntkEP3SG1gSfEm0iOoUwoWjtrmWAk+6QZw0C093HJCGClteo+EwIQDhgyn2cXc5QInegSeg=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; + sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2614,6 +2641,15 @@ let sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; }; }; + "@grpc/grpc-js-1.3.5" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.5.tgz"; + sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -2803,6 +2839,69 @@ let sha512 = "H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q=="; }; }; + "@hyperspace/client-1.18.0" = { + name = "_at_hyperspace_slash_client"; + packageName = "@hyperspace/client"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/client/-/client-1.18.0.tgz"; + sha512 = "nK7jQ8IvrHwaF8gycCuqnNm1nOukzFJxDHZcVZ9Yx1O42zgynDVjDVNFa/scOW2sCAIDAnQrAI6wO4ClrtEYfQ=="; + }; + }; + "@hyperspace/migration-tool-1.2.1" = { + name = "_at_hyperspace_slash_migration-tool"; + packageName = "@hyperspace/migration-tool"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/migration-tool/-/migration-tool-1.2.1.tgz"; + sha512 = "akc8pVshSwrkJsPkpWZzCbIYr5xiXoBZk9DIBAa15DUFo/y2B9eeXDiivDEVWp5tWH9cydUpzLR0XbCUojxr9A=="; + }; + }; + "@hyperspace/rpc-1.15.1" = { + name = "_at_hyperspace_slash_rpc"; + packageName = "@hyperspace/rpc"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/rpc/-/rpc-1.15.1.tgz"; + sha512 = "hp+NvIGLC1KvnR0FVWxtI8ep0I+KA6qto1vtz6bNC8C012QCgQXSMXZmP67su3b8zMLwaOUTOJuhZ1u3fNjtfw=="; + }; + }; + "@hyperswarm/dht-4.0.1" = { + name = "_at_hyperswarm_slash_dht"; + packageName = "@hyperswarm/dht"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/dht/-/dht-4.0.1.tgz"; + sha512 = "wMBbz0m8rgQMERt/Ot6BGo5Y8+ovJSZmqxF0oA2xYPT8vCVBIr8g2F1BkQcLbX2iKRLXRnhic02OEq8b41M0sw=="; + }; + }; + "@hyperswarm/discovery-2.0.1" = { + name = "_at_hyperswarm_slash_discovery"; + packageName = "@hyperswarm/discovery"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/discovery/-/discovery-2.0.1.tgz"; + sha512 = "LM0DxxXYFEOZoUhN4g9VhHKGeM2mQIf8rnfSu/epBLmASAKNoKMijgGUZwhrh06wPROdBSJumjVzKl+8GPnRhA=="; + }; + }; + "@hyperswarm/hypersign-2.1.1" = { + name = "_at_hyperswarm_slash_hypersign"; + packageName = "@hyperswarm/hypersign"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/hypersign/-/hypersign-2.1.1.tgz"; + sha512 = "RcczqJsu2VScRoyJdLbxpYMBNq+73HJT3FVzDZXSOob/WqEeiN2WIvuDtvmFoufAuO/3YVfde/NpZFc/OPjmjw=="; + }; + }; + "@hyperswarm/network-2.1.0" = { + name = "_at_hyperswarm_slash_network"; + packageName = "@hyperswarm/network"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperswarm/network/-/network-2.1.0.tgz"; + sha512 = "TvRRRd//a3q+JhpSh5PaHJfnP4oLM/0eZikyDh2Z+eaJpIZP+vZwdlpPd10neTsPq1zfJX8weRjYLFHNpoMZVg=="; + }; + }; "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -3325,13 +3424,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.30.0" = { + "@jsii/spec-1.31.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.30.0.tgz"; - sha512 = "oXIwvZyHHc/TrwA/3pzQ3gkqBe916EWBvaexNI3rnKZujlHZT4vVVHMCjQ/kUJhcR0GEaahvwlNhiPTu6roC2g=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.31.0.tgz"; + sha512 = "qpJqZ+xj4lnKfk/HJYdYURDmHzh9aBIVOTgwd314AxKmwubDAajlAup+D2F9z9kylAB7GsQiva/SXgUlFjBeQw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3964,13 +4063,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.192" = { + "@microsoft/load-themed-styles-1.10.195" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.192"; + version = "1.10.195"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.192.tgz"; - sha512 = "JeNt/3Wf/GzU731Zfrw64t5Nc4u2Weh2ANnKNXk0S6Eln1zrqSTMJhoXErwCTTBs4XW+I6d8W+k5XTtQh3f0aA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.195.tgz"; + sha512 = "KDCKYsdIo3/ivmu4kzn/LmdttAOwz/bU2C1KywyKy8jHuTj/gU9LBD2htDNGbHQgKObOuqGTpUNNVpVe92Gghw=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4027,13 +4126,13 @@ let sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; }; }; - "@nestjs/schematics-8.0.0" = { + "@nestjs/schematics-8.0.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.0.tgz"; - sha512 = "TldaYlm40CDANGzAugcqkN9N2O4pAA67EMy7qREym8W2o57co7AiEsYUl1CD3zPhBfhVcFRWfnQHs06IbXxPFw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.1.tgz"; + sha512 = "rD/eqpguJpjOVI4uK1MOpqC1vPz+XvC/xT1IYiWDFU9rdJMVhHC5maTKVs/RjkwYRmPzNRTWAoMV3yOD/jC+gw=="; }; }; "@netflix/nerror-1.1.3" = { @@ -4045,13 +4144,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.0" = { + "@netlify/build-15.11.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.0"; + version = "15.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.0.tgz"; - sha512 = "Sw4AGRGJUPzBJMNsvJUWjmr60rlWB1GYiynmTlI/qhUnjB2LgnP7bZLMFDTiHbfgigiK7WEV3NObqNEbE1r8CA=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; + sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4081,22 +4180,22 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.6.0" = { + "@netlify/framework-info-5.7.2" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.6.0"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.6.0.tgz"; - sha512 = "NjGejntulKj6mBnnJjrIfrM8QKaFaoko2TWNc61vatHlTG7BwYmoMHYcfsL3lm2SnGxL1KtUt382IIRD0I1g2A=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.2.tgz"; + sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw=="; }; }; - "@netlify/functions-utils-1.4.4" = { + "@netlify/functions-utils-1.4.7" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.4.4"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.4.tgz"; - sha512 = "2PmAPz4QevLXgwQV13+9zbfGlqP6pebaYS25lhEdXQHk7PCKu9/ejNMdCqZg68jOF3lQ/D86HSluy3vhBXgYGg=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.7.tgz"; + sha512 = "e0y/iUsXWJq65ZUS3mn6ACJlQ6bfVSjtV6DO8Y194tevctnArtQA+F86L08zQklyhJbEV6cmyg4QbHhbLqTNOg=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -4117,22 +4216,22 @@ let sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.20" = { + "@netlify/plugin-edge-handlers-1.11.21" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.20"; + version = "1.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.20.tgz"; - sha512 = "i9hGh29dAU5uFJ51v3Aah9wJC88P/uE2LVSg8JRcK+ZPTnu82kdMkq9qrVSYXfqLBGm8w54bRT0LFUv5IDXjVg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.21.tgz"; + sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; }; }; - "@netlify/plugins-list-2.19.1" = { + "@netlify/plugins-list-2.19.2" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.1.tgz"; - sha512 = "7en2ywbQUbAX1j8AKMqoWOij1hcTSRPIdaK7FXbQvaMYfl8INDN9QwvzvQy9D9CsZ/eWF13RHYx/4y592XXz3Q=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.2.tgz"; + sha512 = "b1HONWSfqmkSExpelWjonK1plrKwoYxITXFZ0GnS8v3Ek+C8md+e4CvXVBnTCKEpqgERaiG6LQA9H8Tkm6nk5g=="; }; }; "@netlify/routing-local-proxy-0.30.2" = { @@ -4153,13 +4252,13 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.12.0" = { + "@netlify/zip-it-and-ship-it-4.14.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.12.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.12.0.tgz"; - sha512 = "LV64orYCV7EYLLXPZvYPKwkCRroXuwfGmaq6gnktN4Ey1NoIVTOySFBIuin90i9Le3bWEHE/WLBnw52ohcPYtw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.14.0.tgz"; + sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4252,13 +4351,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-2.6.4" = { + "@npmcli/arborist-2.7.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.6.4"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.4.tgz"; - sha512 = "A/pDQ/VZpdxaqsQS5XOWrhrPuC+ER7HLq+4ZkEmnO2yo/USFCWEsiUPYKhfY+sWXK3pgKjN7B7CEFmAnSoAt3g=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.7.1.tgz"; + sha512 = "EGDHJs6dna/52BrStr/6aaRcMLrYxGbSjT4V3JzvoTBY9/w5i2+1KNepmsG80CAsGADdo6nuNnFwb7sDRm8ZAw=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4513,13 +4612,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.2.1" = { + "@octokit/openapi-types-8.3.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.2.1"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.2.1.tgz"; - sha512 = "BJz6kWuL3n+y+qM8Pv+UGbSxH6wxKf/SBs5yzGufMHwDefsa+Iq7ZGy1BINMD2z9SkXlIzk1qiu988rMuGXEMg=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; + sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4585,13 +4684,13 @@ let sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; }; }; - "@octokit/types-6.18.1" = { + "@octokit/types-6.19.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.18.1"; + version = "6.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.18.1.tgz"; - sha512 = "5YsddjO1U+xC8ZYKV8yZYebW55PCc7qiEEeZ+wZRr6qyclynzfyD65KZ5FdtIeP0/cANyFaD7hV69qElf1nMsQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; + sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5305,13 +5404,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.1" = { + "@schematics/angular-12.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.1"; + version = "12.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz"; - sha512 = "ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.2.tgz"; + sha512 = "nnFPp9uHLinP05r9TFsWT+fwlbwbLHg3yzJr+0aIOX1OsZQFV8hblEFEqdzFQJyx1uGMp4nvBHvCUlYv9GVQLg=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5341,13 +5440,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.3" = { + "@serverless/components-3.13.4" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.3.tgz"; - sha512 = "pG7XgMbMO8x+XbnG7RJ5WIBoZTG+6PMZsOSVF1ID37/Y5WhAM6PjI0PSJTgRzgheBJm6H96lIGvHXR1sN1xqHQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; + sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5377,13 +5476,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.3" = { + "@serverless/platform-client-4.2.4" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.3.tgz"; - sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.4.tgz"; + sha512 = "DMq4GfckQ+Us64NQZJOtdtKHA3PQU5FZNXwi7QdV5QaVw3PtLjLN65FD7t8PcZ9YmCwL7QOsrCfT5oPJBblBNg=="; }; }; "@serverless/platform-client-china-2.2.0" = { @@ -5638,13 +5737,13 @@ let sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; - "@snyk/docker-registry-v2-client-2.2.2" = { + "@snyk/docker-registry-v2-client-2.2.4" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; - version = "2.2.2"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.2.tgz"; - sha512 = "JkkpVZ8WIWWquazoSTSFlMhYOwt+tk+EMSwOxfu/C/wtaESADCORJBe52z0fAnc+xt3eVUVrM+7prJCIJeSrMg=="; + url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.2.4.tgz"; + sha512 = "7JoxHCYAjJQBOEa11Sdb1scjtq/K4HVDlcE10pNFKbmcUn5Gcm/VDJ2RMEbG2oBdmHTTJMJ5RopIiNMSFd669w=="; }; }; "@snyk/fast-glob-3.2.6-patch" = { @@ -5908,13 +6007,13 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@szmarczak/http-timer-4.0.5" = { + "@szmarczak/http-timer-4.0.6" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; "@tencent-sdk/capi-1.1.8" = { @@ -5944,112 +6043,112 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.0.0" = { + "@textlint/ast-tester-12.0.2" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.0.0.tgz"; - sha512 = "mcAqaOJnAhay8QtDC/na5S72XPxmqGCntOwcLwuSjEmPGAIuLC3GsumLQo4nWSQ2LGnWd6CwLDZT4eBlRWetNA=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.0.2.tgz"; + sha512 = "kHta27+SJC0YxEyEdlNux6m2JepX920gc5x98lVBVYK6Wq6cAF67EEGl1o9ynqroIHEc3wTSEDOFwxXpnlfsNA=="; }; }; - "@textlint/ast-traverse-12.0.0" = { + "@textlint/ast-traverse-12.0.2" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.0.0.tgz"; - sha512 = "Mu0il8qWS9YkzVAqwmrTd+ga5S0LJVWOGjE6d9yADf5xObUDFk4g8ITlfEOiicpX5bTUxT4e1bORxPveCJ8iKQ=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.0.2.tgz"; + sha512 = "OrbGnwtqNAsX7jVSRKecc1Lp2tg54ntnTuvOHkYrZrlC72Hk7+7V/UFQBmFNQCe0cH6Tjb5FFFcgp6f8gM+ehw=="; }; }; - "@textlint/feature-flag-12.0.0" = { + "@textlint/feature-flag-12.0.2" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.0.0.tgz"; - sha512 = "xgK6tsf1Gg6xn8/X0HN4LXzSkJYgmByAvzItUPlI0dzvA4HhhT4gkBeshDCuXsHLc970nYgzy1TYHpyscu7PTw=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.0.2.tgz"; + sha512 = "yNq5uErjFrVq1gghg3A8D77+E36wLXRws5LwSsoRC4LVPIGR+LYZ9BlkoyNTas8dOzGwTs6XZIcWCIWXy77M8Q=="; }; }; - "@textlint/fixer-formatter-12.0.0" = { + "@textlint/fixer-formatter-12.0.2" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.0.0.tgz"; - sha512 = "y2PWue8PANhSF9cXwksxmjDs/n9exOq4daNMhN7VvJk9yrXL+nSuAoyDXjyp09gX4Nfwa/xsOrQRTDVRbizgcw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.0.2.tgz"; + sha512 = "ii49bDLVcgnnxmnaZFX0rDFEIGH3o6DGKnr76cfqy6+DWkGQlhBPyRdbx2bIF65KT+7nAMU0JjfEK+n/WIYFTA=="; }; }; - "@textlint/kernel-12.0.0" = { + "@textlint/kernel-12.0.2" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.0.0.tgz"; - sha512 = "8UXHKhSAgn1aexPjyQE1CRVivCfSz+aFuNrktT9+JOMM3XsSd4JFcMKDhPA1utiiRR+4yDVH5be38vuuJOG9cQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.0.2.tgz"; + sha512 = "IVWC5xyHj58X3/sUXAOndOPMQMkvGaXXPCtLITm8rSwKRc4D/qF2hhwAisOu8XImIwBGzvhFlq+IM7cUW1qDtA=="; }; }; - "@textlint/linter-formatter-12.0.0" = { + "@textlint/linter-formatter-12.0.2" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.0.0.tgz"; - sha512 = "jRRZluLCBXcP8VlA90N8DJOPy890j7rVOVSuyyFn0ypuUK88X2qH9XoEd9yYbo/HmH9ky2h+TeA8CJtOAIjU2g=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.0.2.tgz"; + sha512 = "xRTkLmMUnxW5Y6UXsIc9iLo8hyj5toYXVA/u5ABO4t3QObgtUllWi9W2eauZeY19pLTXweBHYxqG/tl3jTCpJQ=="; }; }; - "@textlint/markdown-to-ast-12.0.0" = { + "@textlint/markdown-to-ast-12.0.2" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.0.0.tgz"; - sha512 = "XaiuePJVDGVIwdjIiITdbdRXZDFnAFY/so3Rb8qAId/Qq9fKPUvgefMkdIG73wUC7LzhrAzH6/CuEO+f77HR5g=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.0.2.tgz"; + sha512 = "xAJ4U/fOL7FoX4bYeYRCsSIeTxFqzKd944AsVxAYrz2ZfKH0TtBSNDDtN22uBEXOrSCCR12Z7QuMcp+URyYWlw=="; }; }; - "@textlint/module-interop-12.0.0" = { + "@textlint/module-interop-12.0.2" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.0.0.tgz"; - sha512 = "WSuwd3pd2xYDCYqpA6NE8FwMZS4WJ2gZmsSCXBpOh3qJ/pHbmrfEaiwOpGQJA4RfXVp8Fy5KfaAQJIr+wox98A=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.0.2.tgz"; + sha512 = "jnFx7B7Q/au49n5Kt/ttPhecvnJGj7643KzPxRNXy422nmafi1EfOZDMGkNEJhlVsQ9WzAnliTTXTFTrBhtVYA=="; }; }; - "@textlint/source-code-fixer-12.0.0" = { + "@textlint/source-code-fixer-12.0.2" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.0.0.tgz"; - sha512 = "+XMJ7unzezEqKh8euWIw1QUprvv7IJzOfV0UPVbkThX2d3ZOzBmK+AzlYbqzCwZ1jkV0QYaRqaptBE+iaaQjNg=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.0.2.tgz"; + sha512 = "lWNndH7Z+KGo8NhM4e3I5fR0SfZeS25AW7MRQGsKbxHL8NSi6KmCXVK8unEls82+DKXW4VdjTTgVYTTOVGa3BA=="; }; }; - "@textlint/text-to-ast-12.0.0" = { + "@textlint/text-to-ast-12.0.2" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.0.0.tgz"; - sha512 = "j73hF6BiwdZurNdzHfOtP5j3v+nTWaTP7RtJf5wpfQBigT4RA+EqmKxUd/OpO+gt/Xy1NkpceLFNllZGRLEvkw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.0.2.tgz"; + sha512 = "vgB4k4CpY59XVrcvWLyFkCoMIVpiUheuy2FC1+Qb44hmoEYT26uglX7SEkBRTQvlzsjChgryzA2PFf2c1wkL0Q=="; }; }; - "@textlint/textlint-plugin-markdown-12.0.0" = { + "@textlint/textlint-plugin-markdown-12.0.2" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.0.0.tgz"; - sha512 = "eo9deECYMkytoiJUqDxEwzugL8sLcCFUbeCpzV5IuIRwQBh85Hds3lp/mtW1B3Q/BxcSa08im2HAa9uRdcoe4Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.0.2.tgz"; + sha512 = "3qizGxt/cz0foqmUuqpk0hnQzXdDehG0CBrzUINJVa7btpDn8bD9fRYn88OdmGLtejVJR/pUDOOZk3RYYEVmlQ=="; }; }; - "@textlint/textlint-plugin-text-12.0.0" = { + "@textlint/textlint-plugin-text-12.0.2" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.0.0.tgz"; - sha512 = "brtexdqu7yvFLstYvVlotMZz5T7SwKfnFnV9Sm+uhg/d3Ddea9exzpiWWcXfRAhfOBd12mmEGM6gwAuSwzrhqg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.0.2.tgz"; + sha512 = "giCTwrioT6bYlOZ+xf/c9ML1GYitQVrtToHzWI6AAs8szg+Q5+h3KCG921sDEGgZfqnljuBaYcHJsW/iNG1+UA=="; }; }; "@textlint/types-1.5.5" = { @@ -6061,22 +6160,22 @@ let sha512 = "80P6fcqgsG9bP6JgR6W/E/oIx+71pplaicYCvvB4vMIeGk0OnWls4Q21kCpDYmq/C/ABtZ/Gy/Ov/8ExQPeQ7A=="; }; }; - "@textlint/types-12.0.0" = { + "@textlint/types-12.0.2" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.0.0.tgz"; - sha512 = "3sB22cGtN9nPViDrW7FJxWkDrpGtyJbvNsvZqzX83HJbAiOmzzeHDkRRLvz9tax76lcdjlNk+2rHY3iSnjhEag=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.0.2.tgz"; + sha512 = "w5aWSCd1sot1waiYw8KnmJNY1q+k9LDoaA6xjGbBuVBGJl0TLXIZoOP8HYFUcKFfJRpqGGob1geTHiyFdnyS0w=="; }; }; - "@textlint/utils-12.0.0" = { + "@textlint/utils-12.0.2" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.0.0.tgz"; - sha512 = "bnIr17iouc4MtVR+r7v8mBasNn3ZsQpfTLTi4RelrZJdICHMBUMOWRX70cVRV/xJck/nfY9igt325qI0y2ELoQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.0.2.tgz"; + sha512 = "IYmibhDMWd8EmRvk8ii9AA/ecrZk5Wj5NNcKuB78+ae2PIVI1zWzQoieSvQyX7DLPRVH4S22RORiEpruRcDzng=="; }; }; "@tokenizer/token-0.1.1" = { @@ -6358,13 +6457,13 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/cors-2.8.11" = { + "@types/cors-2.8.12" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.11.tgz"; - sha512 = "64aQQZXPSo1fdLEE/utClOFVUqDUjyh5j3JorcCTlYQm4r5wsfggx6yhSY6hNudJLkbmIt+pO6xWyCnM0EQgPw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; + sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; "@types/debug-4.1.6" = { @@ -6430,13 +6529,13 @@ let sha512 = "uFIEJESFKNNiuKt93ri5PnvRntAHCm/Aw9tTO2L25xXJSLzC/ARGmpDSJkuTCit7sUW5xUxr91Ta+UOiYaO3+A=="; }; }; - "@types/eslint-7.2.14" = { + "@types/eslint-7.28.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.14"; + version = "7.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.14.tgz"; - sha512 = "pESyhSbUOskqrGcaN+bCXIQDyT5zTaRWfj5ZjjSlMatgGjIn3QQPfocAu4WSabUR7CGyLZ2CQaZyISOEX7/saw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz"; + sha512 = "07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A=="; }; }; "@types/eslint-scope-3.7.1" = { @@ -7024,13 +7123,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.1" = { + "@types/node-15.14.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.1"; + version = "15.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.1.tgz"; - sha512 = "wF6hazbsnwaW3GhK4jFuw5NaLDQVRQ6pWQUGAUrJzxixFkTaODSiAKMPXuHwPEPkAKQWHAzj6uJ5h+3zU9gQxg=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz"; + sha512 = "dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="; }; }; "@types/node-15.6.1" = { @@ -7060,13 +7159,13 @@ let sha512 = "hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug=="; }; }; - "@types/node-16.3.0" = { + "@types/node-16.3.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.3.0"; + version = "16.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.0.tgz"; - sha512 = "OydMCocGMGqw/1BnWbhtK+AtwyWTOigtrQlRe57OQmTNcI3HKlVI5FGlh+c4mSqInMPLynFrTlYjfajPu9O/eQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz"; + sha512 = "jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="; }; }; "@types/node-6.14.13" = { @@ -7195,15 +7294,6 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.11" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.11.tgz"; - sha512 = "0z+/apYJwKFz/RHp6mOMxz/y7xOvWPYPevuCEyAY3gXsjtaac02E26RvxA+I96rfvmVH/dEMGXNvyJfViR1FSQ=="; - }; - }; "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -7411,13 +7501,13 @@ let sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; }; }; - "@types/unist-2.0.5" = { + "@types/unist-2.0.6" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz"; - sha512 = "wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"; + sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; "@types/url-join-4.0.0" = { @@ -7465,13 +7555,13 @@ let sha512 = "1m6uReH8R/RuLVQGvTT/4LlWq67jZEUxp+FBHt0hYv2BT7TUwFbKI0wa7JZVEU/XtlcnX1QcTuZ36es4rGj7jg=="; }; }; - "@types/vscode-1.58.0" = { + "@types/vscode-1.58.1" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.58.0"; + version = "1.58.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.0.tgz"; - sha512 = "enznxcBi4uYt20LWal09E0+VKEHZlq9PZawTu/mpWCVCFWWbiyR8HNI1ikBP1Ypqv8b3A/0md3DY1jcx+oQ8kQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.58.1.tgz"; + sha512 = "sa76rDXiSif09he8KoaWWUQxsuBr2+uND0xn1GUbEODkuEjp2p7Rqd3t5qlvklfmAedLFdL7MdnsPa57uzwcOw=="; }; }; "@types/webpack-4.41.30" = { @@ -7582,13 +7672,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.2" = { + "@typescript-eslint/eslint-plugin-4.28.3" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz"; - sha512 = "PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz"; + sha512 = "jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7600,13 +7690,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.2" = { + "@typescript-eslint/experimental-utils-4.28.3" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz"; - sha512 = "MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz"; + sha512 = "zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7618,22 +7708,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.2" = { + "@typescript-eslint/parser-4.28.3" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.2.tgz"; - sha512 = "Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz"; + sha512 = "ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ=="; }; }; - "@typescript-eslint/scope-manager-4.28.2" = { + "@typescript-eslint/scope-manager-4.28.3" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz"; - sha512 = "MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz"; + sha512 = "/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7645,13 +7735,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.2" = { + "@typescript-eslint/types-4.28.3" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.2.tgz"; - sha512 = "Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz"; + sha512 = "kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7663,13 +7753,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.2" = { + "@typescript-eslint/typescript-estree-4.28.3" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz"; - sha512 = "86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz"; + sha512 = "YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7681,13 +7771,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.2" = { + "@typescript-eslint/visitor-keys-4.28.3" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.2"; + version = "4.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz"; - sha512 = "aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz"; + sha512 = "ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8590,6 +8680,15 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; + "abstract-extension-3.1.1" = { + name = "abstract-extension"; + packageName = "abstract-extension"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-extension/-/abstract-extension-3.1.1.tgz"; + sha512 = "qmUIqQEh6ZZBKN6JfysKgCEBqI4qVexE6/N/MUJjqtQhhuGR8a16GKnK6SGFKv/n1cAlbYxLDXbtyhkxSnVYRQ=="; + }; + }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -9238,6 +9337,15 @@ let sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; }; }; + "ansi-align-1.1.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; + sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; + }; + }; "ansi-align-2.0.0" = { name = "ansi-align"; packageName = "ansi-align"; @@ -9274,6 +9382,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -9310,6 +9427,15 @@ let sha512 = "XnTdFDQzbEewrDx8epWXdw7oqHMvv315vEtfqDiEhhWghIf4++h26c3/FMz7iTLhNrnj56DNIXpbxHZq+3s6qw=="; }; }; + "ansi-diff-stream-1.2.1" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.1.tgz"; + sha512 = "PaKs34INoKpTzcjyKd2GM/CCEeTyDgWKuHSgF0z7ywjpbBFj/pzQf/30v+TR6VBBLia6Mso+W2ygU22ljqbi6A=="; + }; + }; "ansi-escape-sequences-4.1.0" = { name = "ansi-escape-sequences"; packageName = "ansi-escape-sequences"; @@ -9967,6 +10093,15 @@ let sha512 = "kY0YXa72/R7ruTxDqMHCDHnhW9pYvDT+46hQ7tnVDJUb+kp9BJcnOeiRIDheKp4Kn6z630UVywIgiK+4mYgJfA=="; }; }; + "arpeecee-2.2.0" = { + name = "arpeecee"; + packageName = "arpeecee"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arpeecee/-/arpeecee-2.2.0.tgz"; + sha512 = "K6TLPj72xmqyC8sV0CgUWqO5GqmxT6Vn/y8JdraUqpTchWeOQMslvPuqACsD77cnsx/Y0Xq0lkQFzqh/uLD9lw=="; + }; + }; "arr-diff-1.1.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -11020,6 +11155,15 @@ let sha512 = "SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="; }; }; + "await-lock-2.1.0" = { + name = "await-lock"; + packageName = "await-lock"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/await-lock/-/await-lock-2.1.0.tgz"; + sha512 = "t7Zm5YGgEEc/3eYAicF32m/TNvL+XOeYZy9CvBUeJY/szM7frLolFylhrlZNWV/ohWhcUXygrBGjYmoQdxF4CQ=="; + }; + }; "await-semaphore-0.1.3" = { name = "await-semaphore"; packageName = "await-semaphore"; @@ -11047,13 +11191,22 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.942.0" = { + "aws-sdk-2.946.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.942.0"; + version = "2.946.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.942.0.tgz"; - sha512 = "9Y+DWSTvolTJe0nl55sKnsPgtfBCV8WKDE8cAUhgn9MIb4tAGpwejS14AUmqeZ12J58AsgPT3PffdI7Hq9IEtQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.946.0.tgz"; + sha512 = "d0fbVNHdpoeszGUcxOV8m+/kLNxUfKP5QsGwaRjcQfvEokFmvdKsvw87LhepFOa00NaI4J3jt8AbsX4mvmcChg=="; + }; + }; + "aws-sdk-2.947.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.947.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.947.0.tgz"; + sha512 = "m58mW/0Yg2RnRCJSzWZS8JUMhoBQ4trjKf+uJ3bD24jeV+Nf6iIHQ1s4ogP2O2XXUreSRsJNe8l0cOPSOM37Lg=="; }; }; "aws-sign2-0.6.0" = { @@ -12505,13 +12658,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bit-field-1.5.1" = { + "bit-field-1.5.2" = { name = "bit-field"; packageName = "bit-field"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.1.tgz"; - sha512 = "yDanqg5y7PNCzyYl2IPJayOuMt3HRKI8vJDlntSxIqLoKy9YTYUoABUAEuFbQrkzHoAIGfmhhv0M6VRIZ+F0xw=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.2.tgz"; + sha512 = "CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg=="; }; }; "bitcoin-core-2.3.0" = { @@ -12568,13 +12721,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.0" = { + "bittorrent-dht-10.0.1" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.0.tgz"; - sha512 = "mrM18HMabvd3n/hQa4PYe942nWvBsJCBQb5PfT9kUJLlspNPGiulZYSCgWs7+XarS7nufYrGEp07f9eKTKIrgw=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.1.tgz"; + sha512 = "aR0vAgm+SgLiwTCEtNgeuqtT2deg+E/xHCTb7iryikvLbqbR58oFHbNYX4CM6EzyNGSKfcdBKp1gWI5Gcn2Aaw=="; }; }; "bittorrent-dht-6.4.2" = { @@ -12685,6 +12838,15 @@ let sha512 = "pkDss4xFVbMb4270aCyGD3qLv92314Et+FsKzilCLxDz5DuZ2/1g3w4nmBbu6nKApPspnjG7JcwTjGZnduB1yg=="; }; }; + "blake2b-universal-1.0.1" = { + name = "blake2b-universal"; + packageName = "blake2b-universal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2b-universal/-/blake2b-universal-1.0.1.tgz"; + sha512 = "vmMqpF8E9RCde8/+Su/s2rZRxOBwAYQsTyCgok4kLWhWrzMrX0CzID6pVheNJSESY0S0FNTOG4QfRJqnSLOjFA=="; + }; + }; "blake2b-wasm-1.1.7" = { name = "blake2b-wasm"; packageName = "blake2b-wasm"; @@ -13135,6 +13297,15 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; + "boxen-0.6.0" = { + name = "boxen"; + packageName = "boxen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; + sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + }; + }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -13801,6 +13972,24 @@ let sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; }; }; + "buffer-json-2.0.0" = { + name = "buffer-json"; + packageName = "buffer-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz"; + sha512 = "+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw=="; + }; + }; + "buffer-json-encoding-1.0.2" = { + name = "buffer-json-encoding"; + packageName = "buffer-json-encoding"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-json-encoding/-/buffer-json-encoding-1.0.2.tgz"; + sha512 = "zH4Q0aqJnv0xPVX+Imcp+EbiyYg9xq7//mvShmQ08E6wC1EeYg2+1OG2n9EEu0rfiuYjP+j5LsSmQVufdqflrg=="; + }; + }; "buffer-map-0.0.7" = { name = "buffer-map"; packageName = "buffer-map"; @@ -14062,6 +14251,15 @@ let sha512 = "crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A=="; }; }; + "byte-stream-2.1.0" = { + name = "byte-stream"; + packageName = "byte-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byte-stream/-/byte-stream-2.1.0.tgz"; + sha1 = "32eecba6253821d69510b9cf34b315ce3e55b31a"; + }; + }; "bytebuffer-3.5.5" = { name = "bytebuffer"; packageName = "bytebuffer"; @@ -14467,13 +14665,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001243" = { + "caniuse-lite-1.0.30001245" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001243"; + version = "1.0.30001245"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz"; - sha512 = "vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; + sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; }; }; "canvas-2.8.0" = { @@ -14674,6 +14872,15 @@ let sha512 = "eoQC/yAgW3gKTKxjzyClvi+UzuY97YCjcl+lSqbsGIy7HeGaWxCPOQFivhUYm27hgsBMhsJJFya3kGvK6PMIcQ=="; }; }; + "chacha20-universal-1.0.4" = { + name = "chacha20-universal"; + packageName = "chacha20-universal"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chacha20-universal/-/chacha20-universal-1.0.4.tgz"; + sha512 = "/IOxdWWNa7nRabfe7+oF+jVkGjlr2xUL4J8l/OvzZhj+c9RpMqoo3Dq+5nU1j/BflRV4BKnaQ4+4oH1yBpQG1Q=="; + }; + }; "chai-4.3.4" = { name = "chai"; packageName = "chai"; @@ -15088,6 +15295,15 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -16114,13 +16330,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.30.0" = { + "codemaker-1.31.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.30.0.tgz"; - sha512 = "yntR55JhhVlZTfR4CPV6IrCULovPDrk3z0yQR7/ygEtNxEOQrHhX17djJ0rVmIwCJUawv+ODTJ1ipJY9CbxJQw=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.31.0.tgz"; + sha512 = "gyWhtZ4YU5b+pIijCfOZkGrH0DCkUQXyRG3BQtDlnwFJuXyJnDoz+dpM5ErkJuDD9w6Qns4aryyG/bU78huaSg=="; }; }; "codepage-1.4.0" = { @@ -16960,6 +17176,15 @@ let sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; }; }; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; "configstore-3.1.5" = { name = "configstore"; packageName = "configstore"; @@ -17222,13 +17447,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.27.1" = { + "contentful-management-7.29.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.27.1"; + version = "7.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.27.1.tgz"; - sha512 = "ex97MGOQ8lhjGyMZSKuT04Ir13ALOBHvdpQqPxz9SRtbpO6W5XhfCOh0NFqIsXS3C87k2bTi2OV06AsHCQ/PRg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.29.0.tgz"; + sha512 = "Wdyh+uaocvR2cim3NGEA43gX5Nw/rGTijE56zgjK2UFy0lg5Vm6p3wYetVTPO5cyTvnEWeoOIk9zJHUPaJtfCg=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17699,6 +17924,15 @@ let sha512 = "waKkgHU2P19huhuMjCqCDWTYjxCIHoB+nnYjI7pVMUOC1giWxMNDrXkPw9QjWY+PWCFm49bD3wA/J+c7BGZ+og=="; }; }; + "corestore-5.8.2" = { + name = "corestore"; + packageName = "corestore"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/corestore/-/corestore-5.8.2.tgz"; + sha512 = "8OJyqGo1m3PyVvQtUoVcKYz4m4QoBAJE/2rNMJ8SD/U03NGD1z1cYep/n/32I0f3IbujYP5+4lIfBMIDkasB2w=="; + }; + }; "cors-2.8.5" = { name = "cors"; packageName = "cors"; @@ -18617,6 +18851,15 @@ let sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; }; }; + "custom-error-class-1.0.0" = { + name = "custom-error-class"; + packageName = "custom-error-class"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-error-class/-/custom-error-class-1.0.0.tgz"; + sha512 = "bHT5BAycUbsHYexiPuoIEM/o770u48yWBrZHw/f+BRVkERn19xTgNwcHt79A/AYMxUcOfPjb9OrKoj6rVvPJuA=="; + }; + }; "custom-error-instance-2.1.1" = { name = "custom-error-instance"; packageName = "custom-error-instance"; @@ -19544,6 +19787,15 @@ let sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; + "debug-1.0.5" = { + name = "debug"; + packageName = "debug"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; + }; + }; "debug-2.2.0" = { name = "debug"; packageName = "debug"; @@ -20327,6 +20579,24 @@ let sha1 = "bd5a96d45dbed3011bb81bdf68ddf54be8e1bd4e"; }; }; + "derive-key-1.0.1" = { + name = "derive-key"; + packageName = "derive-key"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/derive-key/-/derive-key-1.0.1.tgz"; + sha512 = "7DHGLGvxFF8umw8NEGH3n9KKgEN8duk4Fiy4WmN3QgNKEogDhaNIsTDd5JVN7ilB8xw4ike1Q08z8UJSJ7hebA=="; + }; + }; + "derived-key-storage-2.1.0" = { + name = "derived-key-storage"; + packageName = "derived-key-storage"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/derived-key-storage/-/derived-key-storage-2.1.0.tgz"; + sha512 = "4RKKrpf2YouCASaRHqUvyxtHABGLH7UJWNXPjsJxMvzCj4tettUvuyGsmP2/mpGYhSda7caZkS2oP4rqWjgkZg=="; + }; + }; "des.js-1.0.1" = { name = "des.js"; packageName = "des.js"; @@ -20561,6 +20831,15 @@ let sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; }; }; + "dht-rpc-4.9.6" = { + name = "dht-rpc"; + packageName = "dht-rpc"; + version = "4.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dht-rpc/-/dht-rpc-4.9.6.tgz"; + sha512 = "gzZPsesqOh0Lj0GxjbNhPe42tppSt9qpcMXifcwtr2i3WnhgyhjlXTFrq/po9kl4X98M7+RxwmzpXzPt7hcXwA=="; + }; + }; "di-0.0.1" = { name = "di"; packageName = "di"; @@ -20642,6 +20921,15 @@ let sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; + "diff-file-tree-2.5.1" = { + name = "diff-file-tree"; + packageName = "diff-file-tree"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-file-tree/-/diff-file-tree-2.5.1.tgz"; + sha512 = "blHl14Eexjh6i1KV4GmrimpmWNZss82SiFmWEfgCnCBU8SCKxNcSAazwSvpXMIHhmL5kANSXlBK0z8eIbqmgYQ=="; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -20660,13 +20948,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.6" = { + "diff2html-3.4.7" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.6.tgz"; - sha512 = "0z22v5qc3FHyTO+7BJmZ2CS7KB3Tx8BtbDkrQJ90a9ITh8vdr4uAMrfmQsUiJAS3sd13r8cHhJuPxLZnV8NXLQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.7.tgz"; + sha512 = "QbQMz1qKFxQqqWvpDAxzD37iZb7i9ixVoBjHh7y5PLg1EagYgbrM4Fley4u5YM6i2elNrJNnKjNzyNtGBx3xjw=="; }; }; "diff3-0.0.3" = { @@ -21272,6 +21560,15 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; "dot-prop-4.2.1" = { name = "dot-prop"; packageName = "dot-prop"; @@ -21740,13 +22037,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.771" = { + "electron-to-chromium-1.3.776" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.771"; + version = "1.3.776"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.771.tgz"; - sha512 = "zHMomTqkpnAD9W5rhXE1aiU3ogGFrqWzdvM4C6222SREiqsWQb2w0S7P2Ii44qCaGimmAP1z+OydllM438uJyA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.776.tgz"; + sha512 = "V0w7eFSBoFPpdw4xexjVPZ770UDZIevSwkkj4W97XbE3IsCsTRFpa7/yXGZ88EOQAUEA09JMMsWK0xsw0kRAYw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23479,6 +23776,15 @@ let sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; }; }; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -24226,6 +24532,15 @@ let sha512 = "0EMw4TTUxsMDpDkCg0rXor2gsg+npVrMIHbEhvD0HZyIhUX6AktC/yasm+qKwfyswd06Qy95ZKk8p2crTo0iPA=="; }; }; + "fast-fifo-1.0.0" = { + name = "fast-fifo"; + packageName = "fast-fifo"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.0.0.tgz"; + sha512 = "4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ=="; + }; + }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -24307,6 +24622,15 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; + "fast-memoize-2.5.2" = { + name = "fast-memoize"; + packageName = "fast-memoize"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + }; "fast-printf-1.6.6" = { name = "fast-printf"; packageName = "fast-printf"; @@ -24334,13 +24658,13 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.0.7" = { + "fast-safe-stringify-2.0.8" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz"; + sha512 = "lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag=="; }; }; "fast-stringify-1.1.2" = { @@ -24685,13 +25009,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.0" = { + "file-type-16.5.1" = { name = "file-type"; packageName = "file-type"; - version = "16.5.0"; + version = "16.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.0.tgz"; - sha512 = "OxgWA9tbL8N/WP00GD1z8O0MiwQKFyWRs1q+3FhjdvcGgKqwxcejyGWso3n4/IMU6DdwV+ARZ4A7TTnPkDcSiw=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; + sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; }; }; "file-type-3.9.0" = { @@ -24856,6 +25180,15 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; + "filesize-7.0.0" = { + name = "filesize"; + packageName = "filesize"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-7.0.0.tgz"; + sha512 = "Wsstw+O1lZ9gVmOI1thyeQvODsaoId2qw14lCqIzUhoHKXX7T2hVpB7BR6SvgodMBgWccrx/y2eyV8L7tDmY6A=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -24865,6 +25198,15 @@ let sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; }; }; + "filesystem-constants-1.0.0" = { + name = "filesystem-constants"; + packageName = "filesystem-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesystem-constants/-/filesystem-constants-1.0.0.tgz"; + sha512 = "/ue62eYa8Mk53dc1XXxT1nhwat3ygWMepjrFON8tBVjtjCTVUzM8JTEAQquNoZnmimM4dbxfV9tZeEav1KUccg=="; + }; + }; "fill-range-2.2.4" = { name = "fill-range"; packageName = "fill-range"; @@ -24892,6 +25234,15 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -25126,13 +25477,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.1.1" = { + "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; - version = "7.1.1"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.1.1.tgz"; - sha512 = "jFPrW3qmbPQxjbKUMGPTXbpWoX5plS0BMotAB7q9jwInFd/YdrY40/5Szt4gFroF2BfXHIVuMdQC40X8IcgL3w=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; + sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; "flagged-respawn-1.0.1" = { @@ -25144,6 +25495,15 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; + "flat-4.1.1" = { + name = "flat"; + packageName = "flat"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz"; + sha512 = "FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA=="; + }; + }; "flat-5.0.2" = { name = "flat"; packageName = "flat"; @@ -25738,6 +26098,15 @@ let sha1 = "006775509f3935701784d3ed2fc9f12c9df1bab2"; }; }; + "freemap-1.0.1" = { + name = "freemap"; + packageName = "freemap"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/freemap/-/freemap-1.0.1.tgz"; + sha512 = "14wmuUdlwYz3KrXwbtHe30k4oHnpDQjFrbx3GIkqZjE64hpwa6WDpvs/8p+08kZbhnip49Z58PX8t08E3H8m1g=="; + }; + }; "freeport-async-2.0.0" = { name = "freeport-async"; packageName = "freeport-async"; @@ -26080,6 +26449,15 @@ let sha512 = "WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ=="; }; }; + "fsctl-1.0.0" = { + name = "fsctl"; + packageName = "fsctl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fsctl/-/fsctl-1.0.0.tgz"; + sha512 = "uNHlfhyUJiVO2kHA6ZBnDkBhG1wM8fII+xGfCi5aBoWR7DLh9Q3nOAWe4fEETQzkptahITI1xbe5r23HuA5ECA=="; + }; + }; "fsevents-1.2.13" = { name = "fsevents"; packageName = "fsevents"; @@ -26089,6 +26467,15 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; @@ -26638,13 +27025,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-release-fetch-2.0.0" = { + "gh-release-fetch-2.0.1" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.0.tgz"; - sha512 = "04eT1dMAW5dUgnb/zkOxXXHTLaQpWuZi1gM93sP6KMHtIqyNsCiALHnljh+aomm90L4t3VkSKaCdwottLgVLwQ=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.1.tgz"; + sha512 = "Ca5chpW8/yXeJPYdAxDLB8UShrWViOgnlYl4QTlQi4Y6sJnMXrXK9GMjKHyjJtNAw9IiSh0DbcTMiJZyp6vfMg=="; }; }; "git-apply-delta-0.0.7" = { @@ -26899,6 +27286,15 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; + "glob-7.1.3" = { + name = "glob"; + packageName = "glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + }; + }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -27368,13 +27764,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.17.0" = { + "google-gax-2.18.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.17.0.tgz"; - sha512 = "Ze/Oq0atVNKyKvDzQFU8B82V9w36GELQruXGsiY1jnySbieZ9vS75v98V/Z10PktmSVqis4sQ+FwK2gkgwIiiw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.18.0.tgz"; + sha512 = "PosKicp9XjnMIBMFOWkUfmVVEY6T9EdEs4t24Z3s7t/NOiL7zQAHBuIdCZ5/voxPiZr4SbyCOHF59/KqDjS70A=="; }; }; "google-p12-pem-3.1.0" = { @@ -27449,6 +27845,15 @@ let sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -27755,6 +28160,15 @@ let sha512 = "mCcISYiaRZrJpfqOs0QWa6lfEM/C1V9ASkzFmuz43XBb5s1Vynh+CZy1ECeeJXVGx2PRByjYzb4Y4/zr1byr0w=="; }; }; + "guard-timeout-2.0.0" = { + name = "guard-timeout"; + packageName = "guard-timeout"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/guard-timeout/-/guard-timeout-2.0.0.tgz"; + sha512 = "35geHv72oal0cRUE5t1tZ5KHm3OVPXzFtiMG8AnRPV5FkkEf84RUpeQ0BCeCZunfSLGATW5ZVyALhJKgM7I/6A=="; + }; + }; "gud-1.0.0" = { name = "gud"; packageName = "gud"; @@ -28628,6 +29042,15 @@ let sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; }; }; + "hmac-blake2b-2.0.0" = { + name = "hmac-blake2b"; + packageName = "hmac-blake2b"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-blake2b/-/hmac-blake2b-2.0.0.tgz"; + sha512 = "JbGNtM1YRd8EQH/2vNTAP1oy5lJVPlBFYZfCJTu3k8sqOUm0rRIf/3+MCd5noVykETwTbun6jEOc+4Tu78ubHA=="; + }; + }; "hmac-drbg-1.0.1" = { name = "hmac-drbg"; packageName = "hmac-drbg"; @@ -28763,6 +29186,24 @@ let sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; }; }; + "hrpc-2.2.0" = { + name = "hrpc"; + packageName = "hrpc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hrpc/-/hrpc-2.2.0.tgz"; + sha512 = "iuiO+k823AGyUnwW5dfwStjNVdX881KRvYw+E9RfFbJIXUZWG7OFj0aZYJY6v0752RBWhK6/clwiU++Aau+Aqw=="; + }; + }; + "hrpc-runtime-2.1.1" = { + name = "hrpc-runtime"; + packageName = "hrpc-runtime"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hrpc-runtime/-/hrpc-runtime-2.1.1.tgz"; + sha512 = "L9fSE/eMnJat/9TtlOVKFAiw2SlvB5RH/QbtSaNcYW/oWX1lBxwdrVTTcNOCWnSNLhDBgg5llxj9oM2SACB8WA=="; + }; + }; "hs-client-0.0.9" = { name = "hs-client"; packageName = "hs-client"; @@ -29331,6 +29772,24 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; + "hyperbeam-1.1.3" = { + name = "hyperbeam"; + packageName = "hyperbeam"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperbeam/-/hyperbeam-1.1.3.tgz"; + sha512 = "yozWXZx3yXVprf/MM9WqMt5WY60Im8k6ELJDNFGfyMeO+UieITbDmkvVwMnKQA3ptWqUK8fPf/tEGgklWh7Weg=="; + }; + }; + "hyperbee-1.5.5" = { + name = "hyperbee"; + packageName = "hyperbee"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperbee/-/hyperbee-1.5.5.tgz"; + sha512 = "0zX5JzBgB0kW7stpq2RXiVxzETckGuXJX43hAD5Fom60NUvpnEl6Q2VGKGjfDET04FjPCZAqA08pM2JXa48LjQ=="; + }; + }; "hypercore-7.7.1" = { name = "hypercore"; packageName = "hypercore"; @@ -29340,6 +29799,33 @@ let sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; + "hypercore-9.10.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "9.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-9.10.0.tgz"; + sha512 = "vMaUNcYvtiiXbnjjhj3YbBK/KZEofXfrajiJxJ8rlWVXSyh2fIJcyxTJewfh58IW5bVYNrBPui/CpPyBZiXuZQ=="; + }; + }; + "hypercore-byte-stream-1.0.12" = { + name = "hypercore-byte-stream"; + packageName = "hypercore-byte-stream"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-byte-stream/-/hypercore-byte-stream-1.0.12.tgz"; + sha512 = "JnpLfCkvH9EPRZ8JXLBUAXo+L2wRQ504yWTwtveH+cSwwx0E8I2dbxXvNIsYGDeghOlX3hka0Ng3GiYI0risZw=="; + }; + }; + "hypercore-cache-1.0.2" = { + name = "hypercore-cache"; + packageName = "hypercore-cache"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-cache/-/hypercore-cache-1.0.2.tgz"; + sha512 = "AJ/q7y6EOrXnOH/4+DVcfDygsh1ZXMRGvNc67GBNqwCt22oSCOWhRI6EJ+3HEJciM9M2oSm1WX3qg6kgRhT/Gw=="; + }; + }; "hypercore-crypto-1.0.0" = { name = "hypercore-crypto"; packageName = "hypercore-crypto"; @@ -29349,6 +29835,33 @@ let sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw=="; }; }; + "hypercore-crypto-2.3.0" = { + name = "hypercore-crypto"; + packageName = "hypercore-crypto"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-2.3.0.tgz"; + sha512 = "HdI0VKwPHVIsbkJ2kFot5XRJoQOO1rGg0G2X+Z/mrP8vfZPFD5H1wwJ5nBDp0QYsZfHjOq0nOuUoW/NgdOZofA=="; + }; + }; + "hypercore-default-storage-1.1.1" = { + name = "hypercore-default-storage"; + packageName = "hypercore-default-storage"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-default-storage/-/hypercore-default-storage-1.1.1.tgz"; + sha512 = "y7dSX3VUT4I/X5Cj0h6hcKN2R+/QQIi1HnElnCqY3tQYbVaWYljdbVe3aBQIvkRCfOgWMfe2RbCLX4N78D5syg=="; + }; + }; + "hypercore-promisifier-1.1.0" = { + name = "hypercore-promisifier"; + packageName = "hypercore-promisifier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-promisifier/-/hypercore-promisifier-1.1.0.tgz"; + sha512 = "W4W+fhbWZ5ydLjiAwydXD0yBe9b5cHafoyedVyQ2L8PEsGCeYEr4Efrq/Fyaa/0dheNJvfJGTOs0c36FPweDnw=="; + }; + }; "hypercore-protocol-6.12.0" = { name = "hypercore-protocol"; packageName = "hypercore-protocol"; @@ -29358,6 +29871,33 @@ let sha512 = "T3oy9/7QFejqJX2RGcCUU1944e5/eKbLlSz9JPTNN1QbYFJgat/r7eTyOO8SMSLUimUmQx6YBMKhgYbdKzp7Bw=="; }; }; + "hypercore-protocol-8.0.7" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "8.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-8.0.7.tgz"; + sha512 = "b5TXhqXUZ+Z7M/5/PlCTgElfufDRa3EzACd7y7BA7owLkxQreaUQ58wUO7nzJppDP1bnC2Hz6Hg7nlRPc75bKw=="; + }; + }; + "hypercore-streams-1.0.1" = { + name = "hypercore-streams"; + packageName = "hypercore-streams"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-streams/-/hypercore-streams-1.0.1.tgz"; + sha512 = "OcN2zq9DEoArC84q9VCSrf9Hx1QUkR6ineCOwyOwhE4v/8aUTOx87mAk1nyjMOf76DQmF+tl2vnS2FssLx5N+Q=="; + }; + }; + "hyperdrive-10.20.0" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "10.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.20.0.tgz"; + sha512 = "ejikKQc9L8qUzmmkGe2dk/FGzisY0RTtE1Jw4WfWWXGTun9t/yZ/sV4JfamNBJRd3C0BWV6ZQYeI+1xQDuK3WQ=="; + }; + }; "hyperdrive-9.16.0" = { name = "hyperdrive"; packageName = "hyperdrive"; @@ -29385,6 +29925,15 @@ let sha512 = "JolPS374h6oS1rmz1iebFfeDDvA2nAtiHbx9VJJGMgSDSx4Q77eeY09hDgZwY7KatSKUGWnnSyydSgVUb3+8Lw=="; }; }; + "hyperdrive-schemas-2.0.0" = { + name = "hyperdrive-schemas"; + packageName = "hyperdrive-schemas"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-schemas/-/hyperdrive-schemas-2.0.0.tgz"; + sha512 = "mzD741NjsSt3ttIaavbh3zyNdR3zy0X55HRweNRsw/JEduWjaoOZa6EXz7ly2JxuD7MvAbJxsuNPlnVl9saL6w=="; + }; + }; "hyperlinker-1.0.0" = { name = "hyperlinker"; packageName = "hyperlinker"; @@ -29403,6 +29952,42 @@ let sha512 = "fUuDOrB47PqNK/BAMOS13v41UoaqIxqSLHX6CAbOD7OfT+/GCWO1/vPLfTNutOeXrv1ikuaZ3yux+33Z9vh+rw=="; }; }; + "hyperspace-3.19.0" = { + name = "hyperspace"; + packageName = "hyperspace"; + version = "3.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperspace/-/hyperspace-3.19.0.tgz"; + sha512 = "UF6OGzy3mjJ+XuWzjDN45NMD76WsFZoiq9F9TQpG6JGkbxbM1RXjMDG9JeqnjVg8nzylTwiNkskv7JvFmkR05Q=="; + }; + }; + "hyperspace-mirroring-service-1.0.7" = { + name = "hyperspace-mirroring-service"; + packageName = "hyperspace-mirroring-service"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperspace-mirroring-service/-/hyperspace-mirroring-service-1.0.7.tgz"; + sha512 = "EL2y0WL6r0u3xjOYWAIs6QdbMbZeHIaYxqdqWbjkP2V1pwabBoDwkW57kbIhwumCikU8dfIVXtrHsPJZwCSrfA=="; + }; + }; + "hyperswarm-2.15.3" = { + name = "hyperswarm"; + packageName = "hyperswarm"; + version = "2.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperswarm/-/hyperswarm-2.15.3.tgz"; + sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; + }; + }; + "hypertrie-5.1.1" = { + name = "hypertrie"; + packageName = "hypertrie"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.1.tgz"; + sha512 = "6PjBRPsTH+hqhMpjt1QmxXMFW6XaHNXkjxH1KrL1bp8Fpz7SPOvBNSaQVttvAP6GRzDKkeLraG4q3yJiSL4IhQ=="; + }; + }; "i-0.3.6" = { name = "i"; packageName = "i"; @@ -29493,6 +30078,15 @@ let sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; + "identify-filetype-1.0.0" = { + name = "identify-filetype"; + packageName = "identify-filetype"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/identify-filetype/-/identify-filetype-1.0.0.tgz"; + sha1 = "ce6e29aa762f031b82852a2392a38163fad790eb"; + }; + }; "ieee754-1.1.13" = { name = "ieee754"; packageName = "ieee754"; @@ -29628,6 +30222,15 @@ let sha1 = "d140fa8f614659bd6541233097ddaac25cdd991c"; }; }; + "immediate-3.3.0" = { + name = "immediate"; + packageName = "immediate"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz"; + sha512 = "HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="; + }; + }; "immediate-chunk-store-1.0.8" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; @@ -30141,6 +30744,15 @@ let sha512 = "hUDjc3vBkh/uk1gPfMAD/7Z188Q8cvTGl0nxwaCdwSbzFh6ZKkZh+s2ozVxbE5G9ZNRyeY0+lgbAIOUFsFf98w=="; }; }; + "inquirer-8.1.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz"; + sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -30537,6 +31149,15 @@ let sha512 = "1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="; }; }; + "ipv4-peers-2.0.0" = { + name = "ipv4-peers"; + packageName = "ipv4-peers"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipv4-peers/-/ipv4-peers-2.0.0.tgz"; + sha512 = "6ZMWB3JnCWT0gISUkzChcUEkJS6+LpGRU3h10f9Mfc0usVmyIcbcTN9+QPMg29gLOY8WtaKFbM5ME8qNySoh8g=="; + }; + }; "irc-framework-4.9.0" = { name = "irc-framework"; packageName = "irc-framework"; @@ -30807,13 +31428,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.4.0" = { + "is-core-module-2.5.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz"; - sha512 = "6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz"; + sha512 = "TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg=="; }; }; "is-data-descriptor-0.1.4" = { @@ -32454,13 +33075,13 @@ let sha512 = "O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA=="; }; }; - "joi-17.4.0" = { + "joi-17.4.1" = { name = "joi"; packageName = "joi"; - version = "17.4.0"; + version = "17.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz"; - sha512 = "F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg=="; + url = "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz"; + sha512 = "gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ=="; }; }; "join-component-1.1.0" = { @@ -32634,6 +33255,15 @@ 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"; @@ -32805,40 +33435,40 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.30.0" = { + "jsii-1.31.0" = { name = "jsii"; packageName = "jsii"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.30.0.tgz"; - sha512 = "TfVHhGjP0QiTEkyfnxrDIE8Da+itxnNUK2YoD69qIPAzmZ58goKVqK4sbXrXz2urHSToGLDmWI8+H69cLeVjJw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.31.0.tgz"; + sha512 = "q/p5a6OLO9V0pIcyzS5sygkU9lPskY57KM7KbmppLDPVi5nIqpsRyFfsbPnGWFfDBMk//nkcfj+dbKJIplVkgg=="; }; }; - "jsii-pacmak-1.30.0" = { + "jsii-pacmak-1.31.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.30.0.tgz"; - sha512 = "hYvISYBXZ5WL/+LtG3HpVrimguqAoWa3D8jaqsnoiIGrdmaxKCZ0VnioJYxEX7wVamYuCwXu5NFx/b31BspU6A=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.31.0.tgz"; + sha512 = "fGiAoooRPMadwTWU0vfHJdcNzeYdESnkU/8LmlI4k6yF1iIlFMIbWPulBxP6fV7SqV3CZQKGpUbcPD/Uzf1glg=="; }; }; - "jsii-reflect-1.30.0" = { + "jsii-reflect-1.31.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.30.0.tgz"; - sha512 = "t/1Zr1gGqQSYt94Lfq860VLnCr8y8MLvlLorWYqmBeWKCaSPhtYSC1blGhZhDrAW+CBXiT0Oy64j4Q++AntRmw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.31.0.tgz"; + sha512 = "jKc3tryVeEyEBZFv5bDB8rOaEgW+yBPh0DE4GQCKQQLdkp76Lm9ZSkrnJk5e0gEuAWsmuc1DUs35OcVNr8QRWg=="; }; }; - "jsii-rosetta-1.30.0" = { + "jsii-rosetta-1.31.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.30.0.tgz"; - sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.31.0.tgz"; + sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; "jsii-srcmak-0.1.300" = { @@ -33084,6 +33714,15 @@ let sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; }; + "json-server-0.8.23" = { + name = "json-server"; + packageName = "json-server"; + version = "0.8.23"; + src = fetchurl { + url = "https://registry.npmjs.org/json-server/-/json-server-0.8.23.tgz"; + sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -34039,6 +34678,15 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -34093,6 +34741,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazy-req-1.1.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; + sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; + }; + }; "lazyness-1.2.0" = { name = "lazyness"; packageName = "lazyness"; @@ -34291,6 +34948,15 @@ let sha512 = "SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg=="; }; }; + "level-option-wrap-1.1.0" = { + name = "level-option-wrap"; + packageName = "level-option-wrap"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-option-wrap/-/level-option-wrap-1.1.0.tgz"; + sha1 = "ad20e68d9f3c22c8897531cc6aa7af596b1ed129"; + }; + }; "level-packager-5.1.1" = { name = "level-packager"; packageName = "level-packager"; @@ -36316,6 +36982,15 @@ let sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; }; }; + "log-symbols-3.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -36559,6 +37234,15 @@ let sha512 = "S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="; }; }; + "lowdb-0.13.1" = { + name = "lowdb"; + packageName = "lowdb"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-0.13.1.tgz"; + sha1 = "ebb1057269721b40c316cedb1877e68d7f14ca0c"; + }; + }; "lowdb-1.0.0" = { name = "lowdb"; packageName = "lowdb"; @@ -36928,13 +37612,13 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; - "make-fetch-happen-9.0.3" = { + "make-fetch-happen-9.0.4" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "9.0.3"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.3.tgz"; - sha512 = "uZ/9Cf2vKqsSWZyXhZ9wHHyckBrkntgbnqV68Bfe8zZenlf7D6yuGMXvHZQ+jSnzPkjosuNP1HGasj1J4h8OlQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; + sha512 = "sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg=="; }; }; "make-iterator-1.0.1" = { @@ -37000,15 +37684,6 @@ let sha512 = "p+NIGQbEBxlw/qWwG+NME98G/9kjOQI70hmaH8QEZtIWfTmfMYLKQW4PJChP4izPHNAxlOfv/qefP0+2ZXn84A=="; }; }; - "map-like-2.0.0" = { - name = "map-like"; - packageName = "map-like"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz"; - sha1 = "94496d49ad333c0dc3234b27adbbd1e8535953b4"; - }; - }; "map-merge-1.1.0" = { name = "map-merge"; packageName = "map-merge"; @@ -37846,6 +38521,15 @@ let sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g=="; }; }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; "mem-4.3.0" = { name = "mem"; packageName = "mem"; @@ -37873,15 +38557,6 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-8.1.1" = { - name = "mem"; - packageName = "mem"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; - sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; - }; - }; "mem-fs-2.2.1" = { name = "mem-fs"; packageName = "mem-fs"; @@ -38161,6 +38836,15 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; + "merkle-tree-stream-4.0.0" = { + name = "merkle-tree-stream"; + packageName = "merkle-tree-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-tree-stream/-/merkle-tree-stream-4.0.0.tgz"; + sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; + }; + }; "mermaid-8.11.0" = { name = "mermaid"; packageName = "mermaid"; @@ -38206,6 +38890,15 @@ let sha1 = "1fbf19c136e78b4b2c4e1f5541915fb0d589abe7"; }; }; + "method-override-2.3.10" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; + sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; + }; + }; "method-override-3.0.0" = { name = "method-override"; packageName = "method-override"; @@ -38917,13 +39610,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.3" = { + "minipass-fetch-1.3.4" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz"; - sha512 = "akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.4.tgz"; + sha512 = "TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ=="; }; }; "minipass-flush-1.0.5" = { @@ -39169,6 +39862,15 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; + "mocha-7.2.0" = { + name = "mocha"; + packageName = "mocha"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + }; + }; "mocha-8.4.0" = { name = "mocha"; packageName = "mocha"; @@ -39349,6 +40051,15 @@ let sha1 = "665cb9edebe80d110e658db56c31d0aef51a8f97"; }; }; + "mountable-hypertrie-2.8.0" = { + name = "mountable-hypertrie"; + packageName = "mountable-hypertrie"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mountable-hypertrie/-/mountable-hypertrie-2.8.0.tgz"; + sha512 = "UYwewr82cZvrhJRQLWJtVJRWvJv+zQnp+2SnG051yO7c4rd3auUgwWJ71LyQKfVGq7OPYG1CUtXJKqbo+bVyPw=="; + }; + }; "mout-0.5.0" = { name = "mout"; packageName = "mout"; @@ -40015,6 +40726,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "nanoiterator-1.2.1" = { + name = "nanoiterator"; + packageName = "nanoiterator"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoiterator/-/nanoiterator-1.2.1.tgz"; + sha512 = "M7V9cvfDErMg/H3j90zIGY7Fq3vIGjnnNXwcZ/EXO4plZT3dGNwvykfslHgtbJ8prOGuu3khmc87pND0jdmkcA=="; + }; + }; "nanolru-1.0.0" = { name = "nanolru"; packageName = "nanolru"; @@ -40033,6 +40753,33 @@ let sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; + "nanoresource-1.3.0" = { + name = "nanoresource"; + packageName = "nanoresource"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource/-/nanoresource-1.3.0.tgz"; + sha512 = "OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ=="; + }; + }; + "nanoresource-promise-1.2.2" = { + name = "nanoresource-promise"; + packageName = "nanoresource-promise"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource-promise/-/nanoresource-promise-1.2.2.tgz"; + sha512 = "XCRcRrCoTifA6XJqYaMqlHgWFrAq6aGNnXboRa/Dxa0TNkm3S13+RWCD7/XaB4ySunAmZzx81++OS4kqkDynuA=="; + }; + }; + "nanoresource-promise-2.0.0" = { + name = "nanoresource-promise"; + packageName = "nanoresource-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoresource-promise/-/nanoresource-promise-2.0.0.tgz"; + sha512 = "C4nHaVqhpRYaSiKfXPC3bOiz5mnS3N1gkDhGaWmYLxr4KTAQdWqOr2pEVw4xVmAHJgA9n9anbfuVOacS/skbIA=="; + }; + }; "nanoscheduler-1.0.3" = { name = "nanoscheduler"; packageName = "nanoscheduler"; @@ -40746,6 +41493,15 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; + "node-environment-flags-1.0.6" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; + }; + }; "node-eta-0.9.0" = { name = "node-eta"; packageName = "node-eta"; @@ -41115,6 +41871,15 @@ let sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ=="; }; }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; "node-swt-0.1.1" = { name = "node-swt"; packageName = "node-swt"; @@ -41205,6 +41970,24 @@ let sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; }; }; + "noise-peer-2.1.1" = { + name = "noise-peer"; + packageName = "noise-peer"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/noise-peer/-/noise-peer-2.1.1.tgz"; + sha512 = "8bzZiV7D7GbHn4dSJ89EHYSpXWhveqH+yXjylgPA8qLFAXGizLkZOadZGpIVZqtQpbHuZGI4uUxVqVGHNGzC1A=="; + }; + }; + "noise-protocol-3.0.1" = { + name = "noise-protocol"; + packageName = "noise-protocol"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/noise-protocol/-/noise-protocol-3.0.1.tgz"; + sha512 = "4rQGZvismeb4tMf91O31oDYLGntkEs4p4wa69+14juHTV4A3COtWyDck9PwBqFjg7S8TPZLCUXUdOnOZQJ5UBA=="; + }; + }; "nomnom-1.8.1" = { name = "nomnom"; packageName = "nomnom"; @@ -41610,6 +42393,15 @@ let sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; }; }; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; "npm-run-path-2.0.2" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -41971,13 +42763,13 @@ let sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; - "object-inspect-1.10.3" = { + "object-inspect-1.11.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.10.3"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz"; - sha512 = "e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; + sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; }; }; "object-inspect-1.4.1" = { @@ -42061,6 +42853,15 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; @@ -42214,13 +43015,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.172.4" = { + "office-ui-fabric-react-7.173.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.172.4"; + version = "7.173.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.4.tgz"; - sha512 = "qjZguhw4GyfRADa69JKT/4/PF9plaNDo0rM8/gtCSPj6/yETLrdrfjupUKcS32nD7juVdCRkzepAbTEMm9IgMQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.1.tgz"; + sha512 = "7FKJ4lVXGkVRQccPz3XDeCAysE0h687elFyaRir3BUVAtkqoye9IB7IF/68SsUQahv6Q0LI3YTWym0IG/tlBEQ=="; }; }; "omggif-1.0.10" = { @@ -42394,13 +43195,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.30.0" = { + "oo-ascii-tree-1.31.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.30.0.tgz"; - sha512 = "TzXuoCnha2QHFcAR+8+tBgD7Wnn6Uh+P3aZMoXKDJ3CVLXFnTnzHy4WMmmz01pTfv+f5haQMjhL9OIFJLEZ5kA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.31.0.tgz"; + sha512 = "gNb2MyP1ZcF7cX0WgsAjYe4gZcx7BMLBWKE2TJZZbQ9/j4D8gbJh5Aq6RlXBgev74ODlgAVVcPr2wKU4Dufhqg=="; }; }; "opal-runtime-1.0.11" = { @@ -43537,6 +44338,15 @@ let sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; }; }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -44401,6 +45211,15 @@ let sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + }; + }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -44599,13 +45418,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-3.1.3" = { + "peek-readable-3.1.4" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; - sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; }; }; "peek-stream-1.1.3" = { @@ -45166,6 +45985,15 @@ let sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f"; }; }; + "pluralize-3.1.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz"; + sha1 = "84213d0a12356069daa84060c559242633161368"; + }; + }; "pluralize-5.1.0" = { name = "pluralize"; packageName = "pluralize"; @@ -46517,13 +47345,13 @@ let sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw=="; }; }; - "process-exists-4.0.0" = { + "process-exists-4.1.0" = { name = "process-exists"; packageName = "process-exists"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-4.0.0.tgz"; - sha512 = "BnlcYPiZjSW+fye12g9B7UeCzMAOdMkxuTz3zcytJ2BHwYZf2RoKvuuwUcJLeXlGj58x9YQrvhT21PmKhUc4UQ=="; + url = "https://registry.npmjs.org/process-exists/-/process-exists-4.1.0.tgz"; + sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; }; }; "process-nextick-args-1.0.7" = { @@ -46913,6 +47741,15 @@ let sha512 = "4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw=="; }; }; + "protocol-buffers-4.2.0" = { + name = "protocol-buffers"; + packageName = "protocol-buffers"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-4.2.0.tgz"; + sha512 = "hNp56d5uuREVde7UqP+dmBkwzxrhJwYU5nL/mdivyFfkRZdgAgojkyBeU3jKo7ZHrjdSx6Q1CwUmYJI6INt20g=="; + }; + }; "protocol-buffers-encodings-1.1.1" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; @@ -46922,6 +47759,15 @@ let sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; + "protocol-buffers-schema-3.5.1" = { + name = "protocol-buffers-schema"; + packageName = "protocol-buffers-schema"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz"; + sha512 = "YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw=="; + }; + }; "protocols-1.4.8" = { name = "protocols"; packageName = "protocols"; @@ -47885,6 +48731,15 @@ let sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; + "pumpify-2.0.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-2.0.1.tgz"; + sha512 = "m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw=="; + }; + }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -47975,13 +48830,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.155" = { + "pyright-1.1.156" = { name = "pyright"; packageName = "pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.155.tgz"; - sha512 = "y7VqgiOMiLqzFzQ6LCVUtyb8VCsVbwzOHw16A5YxidGmARRYvFn1kIf1uCDqj3ytxrOcVHyptq90/TSffU0hZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; + sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; }; }; "q-0.9.7" = { @@ -48497,6 +49352,15 @@ let sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; }; }; + "random-words-1.1.1" = { + name = "random-words"; + packageName = "random-words"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/random-words/-/random-words-1.1.1.tgz"; + sha512 = "Rdk5EoQePyt9Tz3RjeMELi2BSaCI+jDiOkBr4U+3fyBRiiW3qqEuaegGAUMOZ4yGWlQscFQGqQpdic3mAbNkrw=="; + }; + }; "randomatic-3.1.1" = { name = "randomatic"; packageName = "randomatic"; @@ -48713,6 +49577,15 @@ let sha512 = "eizTZL2ZO0ZseLqfD4t3Qd0M3b3Nr0MBWpX81EbPMIud/1d/CSfUIx2GQK8fWiAeHoSekO5EOeFib2udTZLwYw=="; }; }; + "reachdown-1.1.0" = { + name = "reachdown"; + packageName = "reachdown"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reachdown/-/reachdown-1.1.0.tgz"; + sha512 = "6LsdRe4cZyOjw4NnvbhUd/rGG7WQ9HMopPr+kyL018Uci4kijtxcGR5kVb5Ln13k4PEE+fEFQbjfOvNw7cnXmA=="; + }; + }; "react-16.14.0" = { name = "react"; packageName = "react"; @@ -49154,13 +50027,13 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; - "readable-web-to-node-stream-3.0.1" = { + "readable-web-to-node-stream-3.0.2" = { name = "readable-web-to-node-stream"; packageName = "readable-web-to-node-stream"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz"; - sha512 = "4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA=="; + url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"; + sha512 = "ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="; }; }; "readdir-glob-1.1.1" = { @@ -49190,6 +50063,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -49460,6 +50342,15 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; + "refpool-1.2.2" = { + name = "refpool"; + packageName = "refpool"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/refpool/-/refpool-1.2.2.tgz"; + sha512 = "uxnVlknIezgMMYQu2RDU/OCkyHntFHnC68PqghdKun2z3W3t5CmAt4uDr28TcPP2GQNsTAjvX1+vpHVrjvcolg=="; + }; + }; "reftools-1.1.9" = { name = "reftools"; packageName = "reftools"; @@ -50630,13 +51521,13 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; - "retry-request-4.2.1" = { + "retry-request-4.2.2" = { name = "retry-request"; packageName = "retry-request"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz"; - sha512 = "afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA=="; + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"; + sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; }; }; "reusify-1.0.4" = { @@ -50837,13 +51728,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.0" = { + "rollup-2.53.2" = { name = "rollup"; packageName = "rollup"; - version = "2.53.0"; + version = "2.53.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; - sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; + sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51170,6 +52061,15 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; + "rxjs-7.2.0" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz"; + sha512 = "aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw=="; + }; + }; "s3-stream-upload-2.0.2" = { name = "s3-stream-upload"; packageName = "s3-stream-upload"; @@ -51251,15 +52151,6 @@ let sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ=="; }; }; - "safe-join-0.1.3" = { - name = "safe-join"; - packageName = "safe-join"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-join/-/safe-join-0.1.3.tgz"; - sha512 = "Ylh1EWn4pmL57HRV/oi4Ye7ws5AxKkdGpyDdWsvZob5VLH8xnQpG8tqmHD5v4SdKlN7hyrBjYt7Jm3faeC+uJg=="; - }; - }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -51503,6 +52394,15 @@ let sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; }; }; + "secretstream-stream-2.0.0" = { + name = "secretstream-stream"; + packageName = "secretstream-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secretstream-stream/-/secretstream-stream-2.0.0.tgz"; + sha512 = "5w3SlraZgFADOa5ScmJIXB/D/Qm2rFksmRNHSs913P9Z6s9ODsknAi85zni1v0KmTd4DovNKxHr3HCObYHes7Q=="; + }; + }; "secure-compare-3.0.1" = { name = "secure-compare"; packageName = "secure-compare"; @@ -51962,13 +52862,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.8.3" = { + "service-runner-2.8.4" = { name = "service-runner"; packageName = "service-runner"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.3.tgz"; - sha512 = "oOP54jRgWE9IBeStnYI9lIdJ333HHe+8pjAvBpDmRyOXNcsvVMN22hbuX93YVlTUE87I8J80ORZ3u01DgNKMYg=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.4.tgz"; + sha512 = "x190eUDdtwmstQluk10aeA89gw0uTtm8OFzlXO6oMgv5MoCcp1PedNI1aCVsQoBHfiraExKhokvEZoxl6xTfQw=="; }; }; "set-blocking-1.0.0" = { @@ -52070,6 +52970,42 @@ let sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; }; }; + "sha256-universal-1.1.2" = { + name = "sha256-universal"; + packageName = "sha256-universal"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-universal/-/sha256-universal-1.1.2.tgz"; + sha512 = "sheCCiEJve+8rS/fgCaXax8SpXrLzPipCvp0+VDXXjDEHw2DdYqV2PdHVNMNWZrQ3fiQjaor4rQCzYdr3g7TIA=="; + }; + }; + "sha256-wasm-2.2.1" = { + name = "sha256-wasm"; + packageName = "sha256-wasm"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha256-wasm/-/sha256-wasm-2.2.1.tgz"; + sha512 = "OkqDgOpo86LzdWlpYVC/MfcQ1jytfR/wxPsGFJTWeEIyLaJg4spZTNQ40vuhYsLNDFidxqvMGae6u9VirkgqqA=="; + }; + }; + "sha512-universal-1.1.2" = { + name = "sha512-universal"; + packageName = "sha512-universal"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-universal/-/sha512-universal-1.1.2.tgz"; + sha512 = "QGS+eFX3ycFiRl5TxIxWv5ltAYXaLpnUeLMJpnEVIB7dEI/7pw3X0kYe3msuE4XaHERReuqDKBYRrCiQsqlESQ=="; + }; + }; + "sha512-wasm-2.3.1" = { + name = "sha512-wasm"; + packageName = "sha512-wasm"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha512-wasm/-/sha512-wasm-2.3.1.tgz"; + sha512 = "YxBYNsaHzTJh5gmk6AbD5aAvXktHy5LsjqbaEVdL60XslC4C7U23w2Mt8g+UDcvidr/K9aFZy3V71Y86Ech27A=="; + }; + }; "shallow-clone-3.0.1" = { name = "shallow-clone"; packageName = "shallow-clone"; @@ -52304,6 +53240,15 @@ let sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g=="; }; }; + "shuffled-priority-queue-2.1.0" = { + name = "shuffled-priority-queue"; + packageName = "shuffled-priority-queue"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shuffled-priority-queue/-/shuffled-priority-queue-2.1.0.tgz"; + sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; + }; + }; "shush-1.0.0" = { name = "shush"; packageName = "shush"; @@ -52430,13 +53375,31 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.40.0" = { + "simple-git-2.41.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.40.0"; + version = "2.41.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.40.0.tgz"; - sha512 = "7IO/eQwrN5kvS38TTu9ljhG9tx2nn0BTqZOmqpPpp51TvE44YIvLA6fETqEVA8w/SeEfPaVv6mk7Tsk9Jns+ag=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.1.tgz"; + sha512 = "n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ=="; + }; + }; + "simple-handshake-3.0.0" = { + name = "simple-handshake"; + packageName = "simple-handshake"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-handshake/-/simple-handshake-3.0.0.tgz"; + sha512 = "8Te0vlxvhpNCMgwnWFTbRR6Re2l8hq8wyXQc3lY9dPYXFxYwVkh79LhDQHFCOWRavmbiOdfqq1l5HT/73Rn2/w=="; + }; + }; + "simple-hypercore-protocol-2.1.1" = { + name = "simple-hypercore-protocol"; + packageName = "simple-hypercore-protocol"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-hypercore-protocol/-/simple-hypercore-protocol-2.1.1.tgz"; + sha512 = "xKuomRCfDDf+r6PDOD3RD88cjOLcbJ0E3Iz9Z+daB4Sq3FVv6efKYsOytgzTfSZMzkszF9EpYHGIILdVI669qA=="; }; }; "simple-markdown-0.4.4" = { @@ -52448,6 +53411,15 @@ let sha512 = "ZmlNUGR1KI12sPHeQ7dQY1qM5KfOgFqClNNVO8zQ9Pg6u7gHLCPFGD+VC7MCwpGDMd1uw3Bb2TfFfR8d6bB34A=="; }; }; + "simple-message-channels-1.2.1" = { + name = "simple-message-channels"; + packageName = "simple-message-channels"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-message-channels/-/simple-message-channels-1.2.1.tgz"; + sha512 = "knSr69GKW9sCjzpoy817xQelpOASUQ53TXCBcSLDKLE7GTGpUAhZzOZYrdbX2Ig//m+8AIrNp7sM7HDNHBRzXw=="; + }; + }; "simple-peer-6.4.4" = { name = "simple-peer"; packageName = "simple-peer"; @@ -52565,6 +53537,15 @@ let sha512 = "51yTA4ZqBY0tHTsBVGy3KAmMI7ArtwSOSmfFwJnZHFL+K76RMzZLx4m59HY5HSByjGHF3q+Fmcl8e5bMF160iQ=="; }; }; + "siphash24-universal-1.0.0" = { + name = "siphash24-universal"; + packageName = "siphash24-universal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/siphash24-universal/-/siphash24-universal-1.0.0.tgz"; + sha512 = "TasWcrGz+ITPEvE6Bhz8hACI39bSuoO9aRBYk601lhFZRpkHikbmmCbD5OkBFenYUmhOCjbOSZDbaHb8+FdWkg=="; + }; + }; "sisteransi-1.0.5" = { name = "sisteransi"; packageName = "sisteransi"; @@ -53015,13 +53996,13 @@ let sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; }; }; - "snyk-sbt-plugin-2.11.2" = { + "snyk-sbt-plugin-2.11.3" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.2.tgz"; - sha512 = "EY9foT2bpl+Dbzj28zewJs7VyAhA4uQIiBABNCi9iaIXGfQLkhiXswkcwysOHxm6RxrXbMsbci0OvuDD7zh4Dg=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.3.tgz"; + sha512 = "xcZAYENuEx+SG51AuLLL59jpN/qerJdSdznTANoyNM7bJjVhTvLTjEfoOxbeogZwKmFDKKUfc6Vw+EdEy8VZug=="; }; }; "snyk-tree-1.0.0" = { @@ -53087,13 +54068,13 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; - "socket.io-4.1.2" = { + "socket.io-4.1.3" = { name = "socket.io"; packageName = "socket.io"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; - sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; }; "socket.io-adapter-0.2.0" = { @@ -53330,6 +54311,15 @@ let sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA=="; }; }; + "sodium-javascript-0.7.3" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.7.3.tgz"; + sha512 = "J2Zzj61bo41oBO4yEM9hTaNo3J98AcmFctjRg3D7+0A5cXdB1jlQOHV1qo2NavDU3BpqCfxdHW5UXCv565zh6Q=="; + }; + }; "sodium-native-2.4.9" = { name = "sodium-native"; packageName = "sodium-native"; @@ -53357,6 +54347,15 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; + "sodium-universal-3.0.4" = { + name = "sodium-universal"; + packageName = "sodium-universal"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.0.4.tgz"; + sha512 = "WnBQ0GDo/82shKQHZBZT9h4q4miCtxkbzcwVLsCBPWNq4qbq8BXhKICt9nPwQAsJ43ct/rF61FKu4t0druUBug=="; + }; + }; "sonic-boom-1.4.1" = { name = "sonic-boom"; packageName = "sonic-boom"; @@ -54806,6 +55805,15 @@ let sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; + "stream-equal-1.1.1" = { + name = "stream-equal"; + packageName = "stream-equal"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-equal/-/stream-equal-1.1.1.tgz"; + sha512 = "SaZxkvxujYBR6NTumhRTg/yztw2p30fzZ/jvSgQtlZFEGI7tdSNDaPbvT47QF92hx6Tar8hAhpr7ErpTNvtuCQ=="; + }; + }; "stream-exhaust-1.0.2" = { name = "stream-exhaust"; packageName = "stream-exhaust"; @@ -54986,6 +55994,15 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; + "streamx-2.10.3" = { + name = "streamx"; + packageName = "streamx"; + version = "2.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/streamx/-/streamx-2.10.3.tgz"; + sha512 = "Ss4rEDWlTAUrIqaQsX6tNBNANHxSmbyrA5PlCji0a6xdJtVzfkEMLLrkVW5OSyr4TshiSb1WA2TqMGMUpGnouQ=="; + }; + }; "strftime-0.10.0" = { name = "strftime"; packageName = "strftime"; @@ -55598,13 +56615,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.8" = { + "strtok3-6.1.3" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.8"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; - sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; }; }; "structured-source-3.0.2" = { @@ -55742,6 +56759,15 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; + "subleveldown-5.0.1" = { + name = "subleveldown"; + packageName = "subleveldown"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/subleveldown/-/subleveldown-5.0.1.tgz"; + sha512 = "cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw=="; + }; + }; "subscriptions-transport-ws-0.9.19" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; @@ -55922,6 +56948,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + }; + }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -55976,13 +57011,13 @@ let sha512 = "N7bBZJH0iF24wsalFZF+fVYMUOigaAUQMIcEKHO3jstK/iL8VmP9xE+P0/a76+FkNcWt+TDv2Gx1taUoUscrvw=="; }; }; - "svelte-preprocess-4.7.3" = { + "svelte-preprocess-4.7.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.3.tgz"; - sha512 = "Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.4.tgz"; + sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; "svelte2tsx-0.4.1" = { @@ -56706,6 +57741,15 @@ let sha512 = "HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw=="; }; }; + "tempy-0.1.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.1.0.tgz"; + sha1 = "8527413cd07100834fcc9cbb8242be95ba0e1fee"; + }; + }; "tempy-0.2.1" = { name = "tempy"; packageName = "tempy"; @@ -57192,6 +58236,15 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; + "thunky-map-1.0.1" = { + name = "thunky-map"; + packageName = "thunky-map"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky-map/-/thunky-map-1.0.1.tgz"; + sha512 = "RC34aHdxC9CYpvuO1TLBnsFa2G9KWFvUbbIbYnqX3hWdUfECWUzjDmv1XRgjRsQ9oGVmUZC+pOD4fAUWB6HU4Q=="; + }; + }; "tildify-1.2.0" = { name = "tildify"; packageName = "tildify"; @@ -57210,6 +58263,15 @@ let sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a"; }; }; + "time-ordered-set-1.0.2" = { + name = "time-ordered-set"; + packageName = "time-ordered-set"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/time-ordered-set/-/time-ordered-set-1.0.2.tgz"; + sha512 = "vGO99JkxvgX+u+LtOKQEpYf31Kj3i/GNwVstfnh4dyINakMgeZCpew1e3Aj+06hEslhtHEd52g7m5IV+o1K8Mw=="; + }; + }; "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; @@ -57237,6 +58299,15 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -58974,6 +60045,15 @@ let sha512 = "9QqdvpGQTXgxthP+lY4e/gIBy+RuqcBaC6JVwT5I3bDLgT/btL6twZMR0pI3/Fgah9G/pdwzIprE5gL6v9UvyQ=="; }; }; + "uint64be-3.0.0" = { + name = "uint64be"; + packageName = "uint64be"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-3.0.0.tgz"; + sha512 = "mliiCSrsE29aNBI7O9W5gGv6WmA9kBR8PtTt6Apaxns076IRdYrrtFhXHEWMj5CSum3U7cv7/pi4xmi4XsIOqg=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -59136,6 +60216,15 @@ let sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; + "underscore-db-0.10.0" = { + name = "underscore-db"; + packageName = "underscore-db"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-db/-/underscore-db-0.10.0.tgz"; + sha1 = "a4bd7f5a9c7f2eec31e4784b402241df36671499"; + }; + }; "underscore.string-2.3.3" = { name = "underscore.string"; packageName = "underscore.string"; @@ -59820,6 +60909,15 @@ let sha1 = "150e65da42bf7742445b958a64eb9b85d1d2b180"; }; }; + "unzip-response-1.0.2" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; "unzip-response-2.0.1" = { name = "unzip-response"; packageName = "unzip-response"; @@ -59883,6 +60981,15 @@ let sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; }; }; + "update-notifier-1.0.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz"; + sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a"; + }; + }; "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -59964,13 +61071,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "urijs-1.19.6" = { + "urijs-1.19.7" = { name = "urijs"; packageName = "urijs"; - version = "1.19.6"; + version = "1.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.6.tgz"; - sha512 = "eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz"; + sha512 = "Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA=="; }; }; "urix-0.1.0" = { @@ -60126,13 +61233,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.2" = { + "url-toolkit-2.2.3" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz"; - sha512 = "l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz"; + sha512 = "Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="; }; }; "urlencode-1.1.0" = { @@ -60180,6 +61287,15 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "username-2.3.0" = { + name = "username"; + packageName = "username"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/username/-/username-2.3.0.tgz"; + sha1 = "ba37dd53ac7d6225e77730fdd79244f1fc058e1e"; + }; + }; "username-5.1.0" = { name = "username"; packageName = "username"; @@ -61351,6 +62467,15 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; + "vm2-3.9.3" = { + name = "vm2"; + packageName = "vm2"; + version = "3.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.3.tgz"; + sha512 = "smLS+18RjXYMl9joyJxMNI9l4w7biW8ilSDaVRvFBDwOH8P0BK1ognFQTpg0wyQ6wIKLTblHJvROW692L/E53Q=="; + }; + }; "voc-1.2.0" = { name = "voc"; packageName = "voc"; @@ -62503,13 +63628,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.1.6" = { + "webtorrent-1.2.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.1.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.6.tgz"; - sha512 = "snRFoYjosyhFUE5pa7wY3JJ1Gjn7ietAC0+rprJKTkS/Ca4J4rHuwDWtG6KTr/DSkdna+sxHvlFXfxCHt+xObw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.4.tgz"; + sha512 = "oQf2HYtylJSHlPX8FDqn79JEO2Og856X78oZHH3So7zJK0RlQVdDolH82MvjbrVxDv6Mfa7s1rIjPKcy+hQEFw=="; }; }; "well-known-symbols-2.0.0" = { @@ -62719,6 +63844,15 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; "widest-line-2.0.1" = { name = "widest-line"; packageName = "widest-line"; @@ -63475,6 +64609,15 @@ let sha512 = "lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="; }; }; + "ws-7.5.3" = { + name = "ws"; + packageName = "ws"; + version = "7.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; + sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63890,6 +65033,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xor-distance-2.0.0" = { + name = "xor-distance"; + packageName = "xor-distance"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xor-distance/-/xor-distance-2.0.0.tgz"; + sha512 = "AsAqZfPAuWx7qB/0kyRDUEvoU3QKsHWzHU9smFlkaiprEpGfJ/NBbLze2Uq0rdkxCxkNM9uOLvz/KoNBCbZiLQ=="; + }; + }; "xorshift-0.2.1" = { name = "xorshift"; packageName = "xorshift"; @@ -63944,6 +65096,15 @@ let sha512 = "zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw=="; }; }; + "xsalsa20-universal-1.0.0" = { + name = "xsalsa20-universal"; + packageName = "xsalsa20-universal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xsalsa20-universal/-/xsalsa20-universal-1.0.0.tgz"; + sha512 = "0M/X61wiKKAGAMqsxEyJ0kY6NtjpcMiKinYSSsl4K7ypgvqXDTMwQK6hxnYE1s1Jm7h6YKcN8obDUg2CC+jVGA=="; + }; + }; "xspfr-0.3.1" = { name = "xspfr"; packageName = "xspfr"; @@ -64241,6 +65402,15 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -64367,6 +65537,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yargs-unparser-1.6.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + }; + }; "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -64457,6 +65636,15 @@ let sha512 = "Bu3kN5sTOyAcbO/cKEQf6KOxsLta9oRF59saLOKnt3OQM+hXapnWaAHcrat3dygd6l34KjxwM5AMJp09TDa8yw=="; }; }; + "yesno-0.3.1" = { + name = "yesno"; + packageName = "yesno"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yesno/-/yesno-0.3.1.tgz"; + sha512 = "7RbCXegyu6DykWPWU0YEtW8gFJH8KBL2d5l2fqB0XpkH0Y9rk59YSSWpzEv7yNJBGAouPc67h3kkq0CZkpBdFw=="; + }; + }; "yn-3.1.1" = { name = "yn"; packageName = "yn"; @@ -64616,22 +65804,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.1"; + version = "12.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz"; - sha512 = "rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.2.tgz"; + sha512 = "oBJcSqXJyPzWGYft5/nD3hJhunxTGXlI4++9ehzdF/fRipOLLMqf77vi/4rUA2DGuaPMbYJeunBnIsgXRGIHIg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.1" - sources."@angular-devkit/core-12.1.1" - sources."@angular-devkit/schematics-12.1.1" + sources."@angular-devkit/architect-0.1201.2" + sources."@angular-devkit/core-12.1.2" + sources."@angular-devkit/schematics-12.1.2" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.1" + sources."@schematics/angular-12.1.2" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64747,7 +65935,7 @@ in sources."ini-2.0.0" sources."inquirer-8.1.1" sources."ip-1.1.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -64770,14 +65958,14 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -65370,7 +66558,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."zxcvbn-4.4.2" @@ -65385,6 +66573,511 @@ in bypassCache = true; reconstructLock = true; }; + "@hyperspace/cli" = nodeEnv.buildNodePackage { + name = "_at_hyperspace_slash_cli"; + packageName = "@hyperspace/cli"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hyperspace/cli/-/cli-1.5.1.tgz"; + sha512 = "+VU/4tWRLf8jVMYyYo1A/rzkZHg0F3LLSvxNti0515a8VD8iyGbyd07nbh88yZC0SWpzMtUZ9ULtKXB2E53MWQ=="; + }; + dependencies = [ + sources."@corestore/networker-1.1.0" + sources."@hyperspace/client-1.18.0" + sources."@hyperspace/migration-tool-1.2.1" + sources."@hyperspace/rpc-1.15.1" + sources."@hyperswarm/dht-4.0.1" + sources."@hyperswarm/discovery-2.0.1" + sources."@hyperswarm/hypersign-2.1.1" + sources."@hyperswarm/network-2.1.0" + sources."@leichtgewicht/ip-codec-2.0.2" + sources."@types/node-16.3.2" + sources."abstract-extension-3.1.1" + sources."abstract-leveldown-6.2.3" + sources."ansi-colors-3.2.3" + (sources."ansi-diff-stream-1.2.1" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-3.1.2" + sources."argparse-1.0.10" + sources."arpeecee-2.2.0" + sources."array-lru-1.1.1" + sources."atomic-batcher-1.0.2" + sources."await-lock-2.1.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."binary-extensions-2.2.0" + (sources."bitfield-rle-2.2.1" // { + dependencies = [ + sources."varint-4.0.1" + ]; + }) + sources."blake2b-2.1.3" + sources."blake2b-universal-1.0.1" + sources."blake2b-wasm-1.1.7" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-stdout-1.3.1" + sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-json-encoding-1.0.2" + sources."bulk-write-stream-1.1.4" + (sources."byte-stream-2.1.0" // { + dependencies = [ + sources."debug-1.0.5" + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."bytes-3.1.0" + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + (sources."chacha20-universal-1.0.4" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."chokidar-3.5.2" + sources."cliclopts-1.1.1" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + ]; + }) + sources."clone-2.1.2" + sources."codecs-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."concat-map-0.0.1" + (sources."concat-stream-2.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."corestore-5.8.2" + sources."count-trailing-zeros-1.0.1" + sources."cross-spawn-async-2.2.5" + sources."crypto-random-string-1.0.0" + sources."custom-error-class-1.0.0" + sources."dat-encoding-5.0.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."deferred-leveldown-5.3.0" + sources."define-properties-1.1.3" + sources."defined-0.0.0" + sources."derive-key-1.0.1" + sources."derived-key-storage-2.1.0" + sources."dht-rpc-4.9.6" + sources."diff-3.5.0" + (sources."diff-file-tree-2.5.1" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."dns-packet-5.3.0" + sources."duplexify-3.7.1" + sources."emoji-regex-7.0.3" + sources."encoding-down-6.3.0" + sources."end-of-stream-1.4.4" + sources."errno-0.1.8" + (sources."es-abstract-1.18.3" // { + dependencies = [ + sources."object.assign-4.1.2" + ]; + }) + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-0.4.0" + sources."fast-bitfield-1.2.2" + sources."fast-fifo-1.0.0" + sources."fd-lock-1.2.0" + sources."filesystem-constants-1.0.0" + sources."fill-range-7.0.1" + sources."find-up-3.0.0" + sources."flat-4.1.1" + sources."flat-tree-1.8.0" + sources."freemap-1.0.1" + sources."fs.realpath-1.0.0" + sources."fsctl-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."glob-7.1.3" + sources."glob-parent-5.1.2" + sources."growl-1.10.5" + sources."guard-timeout-2.0.0" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-bigints-1.0.1" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" + sources."hashlru-2.3.0" + sources."he-1.2.0" + sources."hmac-blake2b-2.0.0" + sources."hrpc-2.2.0" + sources."hrpc-runtime-2.1.1" + sources."hyperbeam-1.1.3" + sources."hyperbee-1.5.5" + sources."hypercore-9.10.0" + (sources."hypercore-byte-stream-1.0.12" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hypercore-cache-1.0.2" + (sources."hypercore-crypto-2.3.0" // { + dependencies = [ + sources."uint64be-3.0.0" + ]; + }) + sources."hypercore-default-storage-1.1.1" + sources."hypercore-promisifier-1.1.0" + (sources."hypercore-protocol-8.0.7" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."hypercore-streams-1.0.1" + sources."hyperdrive-10.20.0" + sources."hyperdrive-schemas-2.0.0" + sources."hyperspace-3.19.0" + (sources."hyperspace-mirroring-service-1.0.7" // { + dependencies = [ + sources."nanoresource-promise-2.0.0" + ]; + }) + sources."hyperswarm-2.15.3" + sources."hypertrie-5.1.1" + sources."identify-filetype-1.0.0" + sources."ieee754-1.2.1" + sources."immediate-3.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."inspect-custom-symbol-1.1.1" + sources."ipv4-peers-2.0.0" + sources."is-bigint-1.0.2" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.1" + sources."is-buffer-2.0.5" + sources."is-callable-1.2.3" + sources."is-core-module-2.5.0" + sources."is-date-object-1.0.4" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.1" + sources."is-number-7.0.0" + sources."is-number-object-1.0.5" + sources."is-options-1.0.1" + sources."is-property-1.0.2" + sources."is-regex-1.1.3" + sources."is-stream-1.1.0" + sources."is-string-1.0.6" + sources."is-symbol-1.0.4" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."js-yaml-3.13.1" + sources."k-bucket-5.1.0" + sources."last-one-wins-1.0.4" + sources."level-6.0.1" + sources."level-codec-9.0.2" + sources."level-concat-iterator-2.0.1" + sources."level-errors-2.0.1" + (sources."level-iterator-stream-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."level-js-5.0.2" + sources."level-option-wrap-1.1.0" + sources."level-packager-5.1.1" + sources."level-supports-1.0.1" + (sources."leveldown-5.6.0" // { + dependencies = [ + sources."node-gyp-build-4.1.1" + ]; + }) + sources."levelup-4.4.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.21" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."supports-color-5.5.0" + ]; + }) + sources."lru-cache-4.1.5" + sources."ltgt-2.2.1" + sources."mem-0.1.1" + sources."memory-pager-1.5.0" + sources."merkle-tree-stream-4.0.0" + sources."mime-1.6.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-1.0.4" + sources."mkdirp-classic-0.5.3" + (sources."mocha-7.2.0" // { + dependencies = [ + sources."chokidar-3.3.0" + sources."debug-3.2.6" + sources."fsevents-2.1.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.1" + sources."readdirp-3.2.0" + sources."supports-color-6.0.0" + ]; + }) + sources."moment-2.29.1" + sources."mountable-hypertrie-2.8.0" + sources."ms-2.0.0" + sources."multicast-dns-7.2.3" + sources."mutexify-1.3.1" + sources."nanoassert-1.1.0" + sources."nanoguard-1.3.0" + sources."nanoiterator-1.2.1" + sources."nanoresource-1.3.0" + sources."nanoresource-promise-1.2.2" + sources."napi-macros-2.0.0" + sources."node-environment-flags-1.0.6" + sources."node-gyp-build-4.2.3" + (sources."noise-peer-2.1.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + (sources."noise-protocol-3.0.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."npm-run-path-1.0.0" + sources."object-assign-4.1.1" + sources."object-inspect-1.11.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.2" + sources."once-1.4.0" + sources."p-debounce-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-1.0.0" + sources."path-parse-1.0.7" + sources."picomatch-2.3.0" + sources."pify-2.3.0" + sources."pretty-bytes-4.0.2" + sources."pretty-hash-1.0.1" + sources."process-nextick-args-2.0.1" + sources."progress-string-1.2.2" + sources."protocol-buffers-4.2.0" + sources."protocol-buffers-encodings-1.1.1" + sources."protocol-buffers-schema-3.5.1" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."pump-3.0.0" + (sources."pumpify-2.0.1" // { + dependencies = [ + sources."duplexify-4.1.1" + sources."readable-stream-3.6.0" + ]; + }) + sources."random-access-file-2.2.0" + sources."random-access-memory-3.1.2" + sources."random-access-storage-1.4.1" + sources."random-words-1.1.1" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."reachdown-1.1.0" + sources."readable-stream-2.3.7" + sources."readdirp-3.6.0" + sources."record-cache-1.1.1" + sources."refpool-1.2.2" + sources."remove-trailing-separator-1.1.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.20.0" + sources."safe-buffer-5.1.2" + (sources."secretstream-stream-2.0.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."sha256-universal-1.1.2" + (sources."sha256-wasm-2.2.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sha512-universal-1.1.2" + (sources."sha512-wasm-2.3.1" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."shuffled-priority-queue-2.1.0" + sources."signed-varint-2.0.1" + (sources."simple-handshake-3.0.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."simple-hypercore-protocol-2.1.1" + sources."simple-message-channels-1.2.1" + (sources."siphash24-1.2.0" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."siphash24-universal-1.0.0" + (sources."sodium-javascript-0.7.3" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sodium-native-3.2.1" + (sources."sodium-universal-3.0.4" // { + dependencies = [ + sources."nanoassert-2.0.0" + ]; + }) + sources."sparse-bitfield-3.0.3" + sources."speedometer-1.1.0" + sources."sprintf-js-1.0.3" + sources."stream-collector-1.0.1" + sources."stream-equal-1.1.1" + sources."stream-shift-1.0.1" + sources."streamx-2.10.3" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."subcommand-2.1.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + (sources."subleveldown-5.0.1" // { + dependencies = [ + sources."abstract-leveldown-6.3.0" + ]; + }) + sources."supports-color-2.0.0" + sources."temp-dir-1.0.0" + sources."tempy-0.1.0" + sources."textextensions-5.12.0" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."thunky-1.1.0" + sources."thunky-map-1.0.1" + sources."time-ordered-set-1.0.2" + sources."timeout-refresh-1.0.3" + sources."to-regex-range-5.0.1" + sources."typedarray-0.0.6" + sources."uint64be-2.0.2" + sources."unbox-primitive-1.0.1" + sources."unique-string-1.0.0" + (sources."unixify-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."unordered-array-remove-1.0.2" + sources."unordered-set-2.0.1" + sources."username-2.3.0" + sources."util-deprecate-1.0.2" + (sources."utp-native-2.5.3" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."varint-5.0.0" + sources."vm2-3.9.3" + sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + 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.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xor-distance-2.0.0" + sources."xsalsa20-1.1.0" + sources."xsalsa20-universal-1.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-2.1.2" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + sources."yargs-unparser-1.6.0" + sources."yesno-0.3.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A CLI for the hyper:// space network."; + homepage = "https://github.com/hypercore-protocol/hypercore-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; @@ -65414,7 +67107,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.0" // { + (sources."@nestjs/schematics-8.0.1" // { dependencies = [ sources."@angular-devkit/core-12.0.5" sources."@angular-devkit/schematics-12.0.5" @@ -65424,11 +67117,11 @@ in sources."ora-5.4.0" ]; }) - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -65467,7 +67160,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -65494,7 +67187,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65552,7 +67245,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -65903,7 +67596,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -66046,7 +67739,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -66174,7 +67867,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66368,7 +68061,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" @@ -66536,7 +68229,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object-visit-1.0.1" @@ -66914,7 +68607,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -67184,7 +68877,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -67195,7 +68888,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67222,7 +68915,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -67289,7 +68982,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67324,14 +69017,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.946.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67416,7 +69109,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.1" + sources."inquirer-8.1.2" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -67471,9 +69164,9 @@ in sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - (sources."rxjs-6.6.7" // { + (sources."rxjs-7.2.0" // { dependencies = [ - sources."tslib-1.14.1" + sources."tslib-2.1.0" ]; }) sources."safe-buffer-5.2.1" @@ -67535,10 +69228,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.6.0"; + version = "10.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.0.tgz"; - sha512 = "scuMBaNgv3fzqqf9uqgkEytIFgjmHACAjmRwLaTi3LjR2ooTkr/74kx9GtWnoj2jZ8ZDY1ivhDrgG74xoTVQPw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.2.tgz"; + sha512 = "2AVJj3hY7YyOkROHZKAyfqbTawRQw+u8y/WGmERm6zu1gW/t0A7ihonchEGbEwzinszDADPzvAZvvMq1BdPe8Q=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67551,7 +69244,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -68078,7 +69771,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" ]; }) sources."proxy-addr-2.0.7" @@ -68376,7 +70069,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.1" - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."uuid-3.4.0" sources."verror-1.10.0" sources."vscode-jsonrpc-6.0.0" @@ -68469,7 +70162,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -68642,7 +70335,7 @@ in sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -68671,7 +70364,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-generator-function-1.0.9" sources."is-negative-zero-2.0.1" @@ -68697,7 +70390,7 @@ in sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -68999,7 +70692,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" @@ -69168,7 +70861,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.40.0" + sources."simple-git-2.41.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -69258,7 +70951,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69400,7 +71093,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -69670,7 +71363,7 @@ in sha512 = "+ikLey611rDoxLBiYuFaNJZxZ1ytCppSEzW+wBIfV5mkyV8Ug5ldHuFzpeUxShZToyzqq8TwhQ5A3CGTU0tSJw=="; }; dependencies = [ - sources."@jsii/spec-1.30.0" + sources."@jsii/spec-1.31.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -69683,7 +71376,7 @@ in sources."cdk8s-plus-17-1.0.0-beta.30" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.30.0" // { + (sources."codemaker-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -69741,25 +71434,25 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.30.0" // { + (sources."jsii-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.30.0" // { + (sources."jsii-pacmak-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.30.0" // { + (sources."jsii-reflect-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.30.0" // { + (sources."jsii-rosetta-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -69783,11 +71476,11 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.30.0" + sources."oo-ascii-tree-1.31.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -69863,7 +71556,7 @@ in }; dependencies = [ sources."@cdktf/hcl2json-0.4.1" - sources."@jsii/spec-1.30.0" + sources."@jsii/spec-1.31.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" sources."@types/node-14.17.5" @@ -70005,7 +71698,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.30.0" // { + (sources."jsii-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70013,10 +71706,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.30.0" // { + (sources."jsii-pacmak-1.31.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.30.0" + sources."codemaker-1.31.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -70025,7 +71718,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.30.0" // { + (sources."jsii-reflect-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70033,7 +71726,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.30.0" // { + (sources."jsii-rosetta-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70077,13 +71770,13 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.30.0" + sources."oo-ascii-tree-1.31.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -70163,7 +71856,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" sources."y18n-5.0.8" @@ -70313,10 +72006,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.11.0.tgz"; - sha512 = "RxYUkfb1HO+ZI62tB0JhqmxYgTrtlS8f3a6+gbFDkEkOCdoCG3GiQBlbV6JjQwdoK7LwNWPxeocJjqoA53ZLnQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.12.0.tgz"; + sha512 = "nRKGxCQLNKvi38q8QIVM+tvGpqEpi1NugCcrRTQfTF78PXofct6ImtVu9aLKDqoq3cAJk9CmngXLPEj+sdgYzQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70425,10 +72118,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.6"; + version = "0.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.6.tgz"; - sha512 = "hch8jmuy563eW8glcDJ42yPpzRSSpd/8+8mJKgTDhJNsuv1lKvVP5/mIrPF+6aB5NKwu/+yjDv+l4Scar5CF6A=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.8.tgz"; + sha512 = "CjSVxlpHutTkycvsJyebL+7Om+okMCkffn6V2LC9/Ix68/RVTjhmvwmbZhVe8zg5G9uyjdNUW+UpDBQy/GAm9Q=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -70726,10 +72419,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.6.tgz"; - sha512 = "MQuXdCblmy5Qnrlqmb7ntDjpgxtdXsbdAgxf23Ai2QFpf14bdc+gz4U/+9pOEpSswODtMvMqnjfTA1lY7p2AfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.7.tgz"; + sha512 = "EiD4lpcGW2WyzxEDpRMYPrjxAa0FhG69SzDoc1KbDht2Do/vgnRzvrtIsufPT14dALAesieN3kVVMCCfA9S6jA=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -70847,7 +72540,7 @@ in sources."node-fetch-2.6.1" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -71018,7 +72711,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -71116,7 +72809,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71314,7 +73007,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -71915,13 +73608,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.155.tgz"; - sha512 = "8UgCdjUkXDc+cN45tuWnVVd3S04SoNv6JuB51BdPkzq2iWcpIfYNHepLIxdkzdCw0I0MQkAqWCo+buRbEVNW9g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.156.tgz"; + sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g=="; }; dependencies = [ - sources."pyright-1.1.155" + sources."pyright-1.1.156" ]; buildInputs = globalBuildInputs; meta = { @@ -71995,10 +73688,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.0"; + version = "0.47.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.0.tgz"; - sha512 = "j9jwYXLlK769B01bwXPei29/pvBu2ulYFSJAr7kwJMCXPCusj9SN1EYpuuUmhBiG+qMvIuaew1xlohr8WhT32Q=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.2.tgz"; + sha512 = "DtUoWcXd++TT9PjjB5JDT3r+2c6wdZZlf2pCXeInELfwW/P4p10BKxP8EnMhkNq4jIzfP0V9QAwLMMppACFuRA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72048,10 +73741,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.1.tgz"; - sha512 = "7e+5qluZxgGrw3l/3ib3BLPm2XlfHp1Gxkcb33vmJAw4CC0TDCB+pw2DyWPVGC3t68rLGGAzo5pYCtaGRoxojw=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.2.tgz"; + sha512 = "KwL3QM6RXsungMkjF0wXsJ6CZuP5h/Lll54Hs49OTJskbQaJTh98DCaCWiIKqBXIuAfxaESEQNihLT2MyefL+Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -72107,7 +73800,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."ajv-8.6.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -72127,7 +73820,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72165,7 +73858,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72217,7 +73910,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -72474,7 +74167,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -72656,7 +74349,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -72960,7 +74653,7 @@ in sources."core-util-is-1.0.2" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-4.2.1" sources."fn.name-1.1.0" sources."follow-redirects-1.14.1" @@ -73308,7 +75001,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -73354,7 +75047,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -73371,7 +75064,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -73628,7 +75321,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73768,7 +75461,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -73999,7 +75692,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74088,7 +75781,7 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" @@ -75308,13 +77001,13 @@ in }) sources."@malept/cross-spawn-promise-1.1.1" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.1.4" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -75546,14 +77239,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.1" // { + (sources."inquirer-8.1.2" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -75755,7 +77448,7 @@ in sources."rimraf-2.7.1" sources."roarr-2.15.4" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + sources."rxjs-7.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -75816,7 +77509,7 @@ in sources."tough-cookie-2.5.0" sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -75941,12 +77634,12 @@ in sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75981,7 +77674,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -76018,7 +77711,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76071,7 +77764,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -76229,7 +77922,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -76279,7 +77972,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.4" + sources."@fluentui/react-7.173.1" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -76293,7 +77986,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.192" + sources."@microsoft/load-themed-styles-1.10.195" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -77023,7 +78716,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -77320,7 +79013,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.172.4" + sources."office-ui-fabric-react-7.173.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77822,7 +79515,7 @@ in }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.2" + sources."url-toolkit-2.2.3" sources."use-3.1.1" sources."util-0.11.1" sources."util-deprecate-1.0.2" @@ -77917,7 +79610,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -78613,7 +80306,7 @@ in }) sources."@segment/loosely-validate-event-2.0.0" sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.1.4" @@ -78854,7 +80547,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -79122,7 +80815,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79434,7 +81127,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-descriptor-1.0.2" @@ -79588,7 +81281,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.0.3" // { + (sources."make-fetch-happen-9.0.4" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -79646,7 +81339,7 @@ in sources."minipass-3.1.3" ]; }) - (sources."minipass-fetch-1.3.3" // { + (sources."minipass-fetch-1.3.4" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -79775,7 +81468,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -80875,7 +82568,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -81347,7 +83040,7 @@ in sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -81629,12 +83322,12 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.15.1" // { + (sources."@google-cloud/pubsub-2.16.0" // { dependencies = [ sources."google-auth-library-7.3.0" ]; }) - sources."@grpc/grpc-js-1.3.4" + sources."@grpc/grpc-js-1.3.5" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -81663,7 +83356,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81937,7 +83630,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -82012,7 +83705,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.17.0" // { + (sources."google-gax-2.18.0" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -82190,7 +83883,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -82312,7 +84005,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" - sources."retry-request-4.2.1" + sources."retry-request-4.2.2" sources."rimraf-3.0.2" (sources."router-1.3.5" // { dependencies = [ @@ -82509,7 +84202,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -82582,10 +84275,10 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.1.0.tgz"; - sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.2.0.tgz"; + sha512 = "HFv/ywCzDAVCxq1IL++lB96zxnUwspScZjqcWown87KPfWng3eJi+BDgXMie9PboXikxOcFoqfd+jJQHDgV3EQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -82634,7 +84327,7 @@ in sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - sources."fkill-7.1.1" + sources."fkill-7.2.1" sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."hard-rejection-2.1.0" @@ -82647,7 +84340,7 @@ in sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.4.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -82689,7 +84382,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pid-port-0.1.1" - (sources."process-exists-4.0.0" // { + (sources."process-exists-4.1.0" // { dependencies = [ sources."ps-list-6.3.0" ]; @@ -82769,7 +84462,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -83229,7 +84922,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -83550,15 +85243,13 @@ in sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.1" - sources."@types/debug-4.1.6" 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-patch-0.0.30" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" - sources."@types/readable-stream-2.3.11" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" sources."@types/yoga-layout-1.9.2" @@ -83623,7 +85314,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83673,7 +85364,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.27.1" + sources."contentful-management-7.29.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -83719,7 +85410,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83772,7 +85463,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.0" + sources."file-type-16.5.1" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -83858,7 +85549,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -83899,7 +85590,7 @@ in ]; }) sources."jest-get-type-25.2.6" - (sources."joi-17.4.0" // { + (sources."joi-17.4.1" // { dependencies = [ sources."@hapi/hoek-9.2.0" sources."@hapi/topo-5.1.0" @@ -83972,7 +85663,7 @@ in sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-path-0.11.5" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -84000,7 +85691,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -84033,7 +85724,7 @@ in sources."react-is-16.13.1" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.1" + sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" sources."redux-4.1.0" sources."regenerator-runtime-0.13.8" @@ -84130,7 +85821,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.0.8" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -84197,7 +85888,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xdg-basedir-4.0.0" sources."xstate-4.22.0" sources."xtend-4.0.2" @@ -84454,7 +86145,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84646,7 +86337,7 @@ in sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -84946,7 +86637,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85061,7 +86752,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fastq-1.11.1" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -85242,7 +86933,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."oauth-sign-0.9.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -85433,7 +87124,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -85929,7 +87620,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -86331,7 +88022,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -86723,7 +88414,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."opener-1.5.2" sources."portfinder-1.0.28" sources."qs-6.10.1" @@ -87500,7 +89191,7 @@ in sources."path-key-2.0.1" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.4.2" @@ -87607,7 +89298,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -88049,7 +89740,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88675,7 +90366,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -88933,7 +90624,7 @@ in sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -89227,6 +90918,568 @@ in bypassCache = true; reconstructLock = true; }; + jsonplaceholder = nodeEnv.buildNodePackage { + name = "jsonplaceholder"; + packageName = "jsonplaceholder"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonplaceholder/-/jsonplaceholder-0.3.3.tgz"; + sha1 = "f2de92d8c2f9211e7b4e859ef73d44d32b1b5bfd"; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."ajv-6.12.6" + sources."ansi-align-1.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.2.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" + sources."body-parser-1.19.0" + sources."boxen-0.6.0" + sources."braces-1.8.5" + sources."bytes-3.1.0" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."camelcase-2.1.1" + sources."capture-stack-trace-1.0.1" + sources."caseless-0.12.0" + sources."chalk-1.1.3" + sources."chokidar-1.7.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cliui-3.2.0" + sources."clone-1.0.4" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."combined-stream-1.0.8" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) + (sources."configstore-2.1.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."connect-pause-0.1.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."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."create-error-class-3.0.2" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.6.0" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."error-ex-1.3.2" + sources."errorhandler-1.5.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."express-4.17.1" + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."file-uri-to-path-1.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."filled-array-1.1.0" + sources."finalhandler-1.1.2" + sources."find-up-1.1.2" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."fsevents-1.2.13" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."got-5.7.1" + sources."graceful-fs-4.2.6" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (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" + ]; + }) + sources."hosted-git-info-2.8.9" + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."imurmurhash-0.1.4" + sources."inherits-2.0.3" + sources."ini-1.3.8" + sources."invert-kv-1.0.0" + sources."ipaddr.js-1.9.1" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-core-module-2.5.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.3" + ]; + }) + sources."is-dotfile-1.0.3" + sources."is-equal-shallow-0.1.3" + sources."is-extendable-0.1.1" + sources."is-extglob-1.0.0" + sources."is-finite-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-2.0.1" + sources."is-npm-1.0.0" + sources."is-number-2.1.0" + sources."is-obj-1.0.1" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-promise-2.2.2" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isobject-2.1.0" + sources."isstream-0.1.2" + sources."jju-1.4.0" + sources."jsbn-0.1.1" + sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-server-0.8.23" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."kind-of-3.2.2" + sources."latest-version-2.0.0" + sources."lazy-req-1.1.0" + sources."lcid-1.0.0" + sources."load-json-file-1.1.0" + sources."lodash-4.17.21" + sources."lodash.assign-4.2.0" + sources."lowdb-0.13.1" + sources."lowercase-keys-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."math-random-1.0.4" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."method-override-2.3.10" + sources."methods-1.1.2" + sources."micromatch-2.3.11" + sources."mime-1.6.0" + sources."mime-db-1.48.0" + sources."mime-types-2.1.31" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."ms-2.0.0" + sources."nan-2.14.2" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + sources."kind-of-6.0.3" + ]; + }) + sources."negotiator-0.6.2" + sources."node-status-codes-1.0.0" + sources."node-uuid-1.4.8" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + ]; + }) + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.omit-2.0.1" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."os-homedir-1.0.2" + sources."os-locale-1.4.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."package-json-2.4.0" + sources."parse-glob-3.0.4" + sources."parse-json-2.2.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-1.1.0" + sources."performance-now-2.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pluralize-3.1.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."preserve-0.2.0" + sources."process-nextick-args-2.0.1" + sources."proxy-addr-2.0.7" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.7.0" + (sources."randomatic-3.1.1" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.3" + ]; + }) + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.7" + (sources."readdirp-2.2.1" // { + dependencies = [ + sources."arr-diff-4.0.0" + sources."array-unique-0.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."kind-of-6.0.3" + sources."micromatch-3.1.10" + ]; + }) + sources."regex-cache-0.4.4" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-1.20.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."semver-5.7.1" + sources."semver-diff-2.1.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."slide-1.1.6" + (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."isobject-3.0.1" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.1" + 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.9" + 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."steno-0.4.4" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."timed-out-3.1.3" + sources."to-object-path-0.3.0" + sources."to-regex-3.0.2" + (sources."to-regex-range-2.1.1" // { + dependencies = [ + sources."is-number-3.0.0" + ]; + }) + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."underscore-db-0.10.0" + sources."union-value-1.0.1" + 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."isobject-3.0.1" + ]; + }) + sources."unzip-response-1.0.2" + sources."update-notifier-1.0.3" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-module-1.0.0" + sources."widest-line-1.0.0" + sources."window-size-0.2.0" + sources."wrap-ansi-2.1.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."y18n-3.2.2" + sources."yargs-4.8.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A simple fake REST API server for testing and prototyping."; + homepage = "http://jsonplaceholder.typicode.com"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; kaput-cli = nodeEnv.buildNodePackage { name = "kaput-cli"; packageName = "kaput-cli"; @@ -89409,7 +91662,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.18" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-treeify-1.1.33" sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" @@ -89461,7 +91714,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."which-1.3.1" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" @@ -89510,8 +91763,8 @@ in dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" - sources."@types/node-16.3.0" + sources."@types/cors-2.8.12" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89763,7 +92016,7 @@ in sources."escalade-3.1.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."filter-obj-1.1.0" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" @@ -89796,7 +92049,7 @@ in sources."is-boolean-object-1.1.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.9" @@ -89828,7 +92081,7 @@ in sources."node-fetch-2.6.1" sources."node-localstorage-1.3.1" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -90655,7 +92908,7 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.2.1" + sources."@octokit/openapi-types-8.3.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" @@ -90667,7 +92920,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.18.1" + sources."@octokit/types-6.19.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -90927,7 +93180,7 @@ in sources."is-boolean-object-1.1.1" sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -90985,7 +93238,7 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-9.0.3" + sources."make-fetch-happen-9.0.4" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ @@ -91022,7 +93275,7 @@ in }) sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -91075,7 +93328,7 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -92323,7 +94576,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -92496,7 +94749,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92620,7 +94873,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92689,7 +94942,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -92795,7 +95048,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -93657,7 +95910,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -93868,7 +96121,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93999,24 +96252,24 @@ in sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-8.2.0" - sources."@fluentui/dom-utilities-2.1.2" - sources."@fluentui/font-icons-mdl2-8.1.4" - sources."@fluentui/foundation-legacy-8.1.4" - sources."@fluentui/keyboard-key-0.3.2" - sources."@fluentui/merge-styles-8.1.2" + sources."@fluentui/date-time-utilities-8.2.1" + sources."@fluentui/dom-utilities-2.1.3" + sources."@fluentui/font-icons-mdl2-8.1.6" + sources."@fluentui/foundation-legacy-8.1.6" + sources."@fluentui/keyboard-key-0.3.3" + sources."@fluentui/merge-styles-8.1.3" sources."@fluentui/react-8.22.0" - sources."@fluentui/react-focus-8.1.5" - sources."@fluentui/react-hooks-8.2.3" - sources."@fluentui/react-window-provider-2.1.2" - sources."@fluentui/set-version-8.1.2" - sources."@fluentui/style-utilities-8.1.4" - sources."@fluentui/theme-2.1.3" - sources."@fluentui/utilities-8.2.0" - sources."@microsoft/load-themed-styles-1.10.192" + sources."@fluentui/react-focus-8.1.8" + sources."@fluentui/react-hooks-8.2.4" + sources."@fluentui/react-window-provider-2.1.3" + sources."@fluentui/set-version-8.1.3" + sources."@fluentui/style-utilities-8.2.0" + sources."@fluentui/theme-2.1.4" + sources."@fluentui/utilities-8.2.1" + sources."@microsoft/load-themed-styles-1.10.195" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/cors-2.8.11" + sources."@types/cors-2.8.12" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -94439,7 +96692,7 @@ in sources."mime-types-2.1.31" sources."ms-2.1.3" sources."native-promise-only-0.8.1" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" @@ -94485,7 +96738,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -94526,10 +96779,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.1.18"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.18.tgz"; - sha512 = "urJ/UEOwS5jL+bhNccADuBBFbaewgIj5LZxTsFgM56bCPxNIGEwVrwW4kaVGZqujNYLaZrUn1BlhKaXW6nIUnA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.2.tgz"; + sha512 = "VR0FrWp5wRUxTSTq/RDv6Lybhi/KL8UCf1pQN6xyUDBamysfPneunOB/TNa29cazM+AXslVYxe8VnDJxMjBaiA=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94663,7 +96916,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.0" // { + (sources."@netlify/build-15.11.5" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -94697,13 +96950,13 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.6.0" // { + (sources."@netlify/framework-info-5.7.2" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.4.4" + sources."@netlify/functions-utils-1.4.7" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94715,19 +96968,19 @@ in ]; }) sources."@netlify/open-api-2.5.0" - (sources."@netlify/plugin-edge-handlers-1.11.20" // { + (sources."@netlify/plugin-edge-handlers-1.11.21" // { dependencies = [ sources."@types/node-14.17.5" ]; }) - sources."@netlify/plugins-list-2.19.1" + sources."@netlify/plugins-list-2.19.2" sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.12.0" // { + (sources."@netlify/zip-it-and-ship-it-4.14.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -94854,7 +97107,7 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.2.1" + sources."@octokit/openapi-types-8.3.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.4.1" @@ -94865,7 +97118,7 @@ in }) sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.18.1" + sources."@octokit/types-6.19.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94902,7 +97155,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -94910,8 +97163,8 @@ in sources."@types/semver-7.3.7" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.2" - (sources."@typescript-eslint/typescript-estree-4.28.2" // { + sources."@typescript-eslint/types-4.28.3" + (sources."@typescript-eslint/typescript-estree-4.28.3" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -94928,7 +97181,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.2" + sources."@typescript-eslint/visitor-keys-4.28.3" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -95061,7 +97314,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -95327,7 +97580,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95412,7 +97665,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fast-stringify-1.1.2" sources."fastq-1.11.1" sources."fd-slicer-1.1.0" @@ -95425,7 +97678,7 @@ in ]; }) sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/yargs-15.0.14" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -95497,7 +97750,7 @@ in sources."get-port-5.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.0" + sources."gh-release-fetch-2.0.1" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" sources."glob-7.1.7" @@ -95636,7 +97889,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -95938,7 +98191,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object-visit-1.0.1" @@ -96145,7 +98398,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.0" + sources."rollup-2.53.2" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96162,7 +98415,6 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -96571,7 +98823,7 @@ in sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -96752,7 +99004,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -97318,7 +99570,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.2" + sources."ws-7.5.3" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -97581,7 +99833,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -97705,10 +99957,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.10.tgz"; - sha512 = "369KB2EC1fLzz7hIuKSRSIVhh9PXqFAwh1stxlNX8DMyat9y/maswuRxRMttyelnduLDa04r4wgVZ4fgRwZWuQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz"; + sha512 = "egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -97896,12 +100148,12 @@ in ]; }) sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -98081,7 +100333,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -98423,10 +100675,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.8.2"; + version = "11.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.2.tgz"; - sha512 = "+TWwhsFUJrar3z1KdCdwNLW6VQkqbU6pBZQtUVMfoAaeHq/L5SAnF6CwIzE/8hmKMNvxFAEe5Ow41ibhLa2iIg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.8.3.tgz"; + sha512 = "NslIB6Af7GagVrN+bvBkObLyawIZfOnDnl8n9MHE+dFt0aChRYtvR6T2BLJKzOPIepCLmmh0NRR/qha0ExAELQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -98530,6 +100782,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" + sources."fast-memoize-2.5.2" sources."fastq-1.11.1" sources."figgy-pudding-3.5.2" sources."fill-range-7.0.1" @@ -98624,20 +100877,17 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.3" - sources."map-age-cleaner-0.1.3" - sources."mem-8.1.1" + sources."make-fetch-happen-9.0.4" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.48.0" sources."mime-types-2.1.31" - sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -98662,7 +100912,6 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-defer-1.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" @@ -99252,7 +101501,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99390,7 +101639,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.771" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99402,7 +101651,7 @@ in sources."error-ex-1.3.2" (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) sources."es-to-primitive-1.2.1" @@ -99531,7 +101780,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -100238,7 +102487,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.8.3" // { + (sources."service-runner-2.8.4" // { dependencies = [ sources."semver-7.3.5" sources."yargs-14.2.3" @@ -100498,7 +102747,7 @@ in sources."ipaddr.js-2.0.1" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -101129,7 +103378,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."into-stream-6.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -101354,7 +103603,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -101467,10 +103716,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.9.1.tgz"; - sha512 = "2qlbvmHB+ULAoTCMpJ75oADYoVQnsxD1ipCemdDJA2KW4auGwoTUzyowVYEiAe4DIDOqw3axhHVkNAo7P6goZA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.0.tgz"; + sha512 = "fHKtgvnp9CfT/3qijmjUCstOFSB45OAF5EoK6lJxfdpEDe9bgO4om4do8Ut3boV+atZbV6rlEk9vZOUK6BGclw=="; }; buildInputs = globalBuildInputs; meta = { @@ -101510,6 +103759,29 @@ in bypassCache = true; reconstructLock = true; }; + postcss = nodeEnv.buildNodePackage { + name = "postcss"; + packageName = "postcss"; + version = "8.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; + sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + }; + dependencies = [ + sources."colorette-1.2.2" + sources."nanoid-3.1.23" + sources."source-map-js-0.6.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Tool for transforming styles with JS plugins"; + homepage = "https://postcss.org/"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; @@ -101783,7 +104055,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -101811,7 +104083,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -102016,10 +104288,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.155.tgz"; - sha512 = "y7VqgiOMiLqzFzQ6LCVUtyb8VCsVbwzOHw16A5YxidGmARRYvFn1kIf1uCDqj3ytxrOcVHyptq90/TSffU0hZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; + sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -102099,7 +104371,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -102222,7 +104494,7 @@ in sources."pako-0.2.9" ]; }) - sources."urijs-1.19.6" + sources."urijs-1.19.7" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" @@ -102317,7 +104589,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -102502,7 +104774,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -102690,7 +104962,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102919,7 +105191,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103216,7 +105488,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.4" sources."is-deflate-1.0.0" @@ -103389,7 +105661,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -104255,7 +106527,7 @@ in sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -104313,7 +106585,7 @@ in }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.1" + sources."@types/node-15.14.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -104405,7 +106677,7 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fill-range-7.0.1" sources."foreach-2.0.5" sources."fsevents-2.3.2" @@ -104643,7 +106915,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -104789,10 +107061,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.0"; + version = "2.53.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; - sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; + sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104847,14 +107119,14 @@ in sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.11" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.58.0" - sources."@typescript-eslint/eslint-plugin-4.28.2" - sources."@typescript-eslint/experimental-utils-4.28.2" - sources."@typescript-eslint/parser-4.28.2" - sources."@typescript-eslint/scope-manager-4.28.2" - sources."@typescript-eslint/types-4.28.2" - sources."@typescript-eslint/typescript-estree-4.28.2" - sources."@typescript-eslint/visitor-keys-4.28.2" + sources."@types/vscode-1.58.1" + sources."@typescript-eslint/eslint-plugin-4.28.3" + sources."@typescript-eslint/experimental-utils-4.28.3" + sources."@typescript-eslint/parser-4.28.3" + sources."@typescript-eslint/scope-manager-4.28.3" + sources."@typescript-eslint/types-4.28.3" + sources."@typescript-eslint/typescript-estree-4.28.3" + sources."@typescript-eslint/visitor-keys-4.28.3" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -105011,7 +107283,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -105073,7 +107345,7 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."nth-check-2.0.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."os-homedir-1.0.2" @@ -105118,7 +107390,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.0" + sources."rollup-2.53.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -105290,7 +107562,7 @@ in sources."node-uuid-1.4.1" sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" (sources."openid-2.0.9" // { dependencies = [ sources."qs-6.10.1" @@ -105496,10 +107768,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.51.2"; + version = "2.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.51.2.tgz"; - sha512 = "I2g7zrS9cGNfwMJFQiypUX0DlrxgbhRrmIWyhq784FFljgssEN/6dq5sYBp0nBaK5yPBlqSWILXzQ3jaeG7vIw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.52.0.tgz"; + sha512 = "MoEA+YLQsfknLuc2d/uV8vTehnAsAJqOXCyQLOZn3/QQ+rdwUFzasbg0m+zZdNMespfcHDTTht+CUgS2/svUJw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105532,7 +107804,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.3" // { + (sources."@serverless/components-3.13.4" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105562,7 +107834,7 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.3" // { + (sources."@serverless/platform-client-4.2.4" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" @@ -105589,13 +107861,11 @@ in sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.2" sources."@types/caseless-0.12.2" - sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" - sources."@types/readable-stream-2.3.11" + sources."@types/node-16.3.2" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -105656,7 +107926,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105836,6 +108106,7 @@ in sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" sources."dotenv-10.0.0" + sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" sources."duplexify-4.1.1" sources."duration-0.2.2" @@ -105878,17 +108149,17 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.1" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.0" + sources."file-type-16.5.1" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-6.4.0" + sources."filesize-7.0.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -105923,7 +108194,7 @@ in (sources."got-11.8.2" // { dependencies = [ sources."@sindresorhus/is-4.0.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."cacheable-request-7.0.2" sources."decompress-response-6.0.0" sources."defer-to-connect-2.0.1" @@ -106130,7 +108401,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -106164,7 +108435,7 @@ in sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.1" + sources."readable-web-to-node-stream-3.0.2" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" @@ -106200,7 +108471,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.40.0" // { + (sources."simple-git-2.41.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106241,7 +108512,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.8" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -106361,7 +108632,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -107010,10 +109281,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.657.0"; + version = "1.662.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.657.0.tgz"; - sha512 = "wTJ5k49SopXL9Sm8Ltlp+HVVpakpaxkt//IRzOTEN75CMd/NpLtCSD34oAbUfo+tTrN1Ig8MSXGk5Z3XQm2d7w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.662.0.tgz"; + sha512 = "sVSFIZ5cxhKoe2Gr3KD3LHKuTlCzVgA0KPa/2NhwyHFVQoSmoVirqntUt4V3taiEOFAk+F++cQ9jAcx2Qlc8nA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -107035,7 +109306,7 @@ in sources."semver-7.3.5" ]; }) - sources."@snyk/docker-registry-v2-client-2.2.2" + sources."@snyk/docker-registry-v2-client-2.2.4" sources."@snyk/fast-glob-3.2.6-patch" (sources."@snyk/fix-1.650.0" // { dependencies = [ @@ -107091,7 +109362,7 @@ in sources."tslib-2.3.0" ]; }) - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/debug-4.1.6" sources."@types/emscripten-1.39.5" @@ -107639,7 +109910,7 @@ in sources."yallist-2.1.2" ]; }) - (sources."snyk-sbt-plugin-2.11.2" // { + (sources."snyk-sbt-plugin-2.11.3" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -107762,16 +110033,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; - sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" - sources."@types/node-16.3.0" + sources."@types/cors-2.8.12" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107868,7 +110139,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -108146,7 +110417,7 @@ in sources."errno-0.1.8" (sources."es-abstract-1.18.3" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) (sources."es-get-iterator-1.1.2" // { @@ -108719,7 +110990,7 @@ in sources."shellsubstitute-1.2.0" (sources."side-channel-1.0.4" // { dependencies = [ - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" ]; }) sources."signal-exit-3.0.3" @@ -108937,7 +111208,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -109037,7 +111308,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.947.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109290,7 +111561,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -109423,7 +111694,7 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-hash-0.3.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -109855,7 +112126,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."ajv-8.6.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -109875,7 +112146,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109913,7 +112184,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109964,7 +112235,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -110155,7 +112426,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -110197,7 +112468,7 @@ in sources."source-map-0.7.3" sources."strip-indent-3.0.0" sources."svelte-3.38.3" - sources."svelte-preprocess-4.7.3" + sources."svelte-preprocess-4.7.4" sources."svelte2tsx-0.4.1" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" @@ -110653,7 +112924,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -111199,36 +113470,36 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.0.0.tgz"; - sha512 = "hpXezTFR/BxNzc0iJqwspAuHYrCWF/nF7mBS9OGzgBJx5FfS1xfsAIityV65Ffcr+nxCExzTQqRHR6qSWOZmbg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.0.2.tgz"; + sha512 = "pg453CN2xtLoqss9YVSKkEFJtJ1AB/9SWTxl11fgdqFPCOK2W/320CJRqSxo5bJFpIn5+6bjqkuPHS0cZWLPvg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-12.0.0" - sources."@textlint/ast-tester-12.0.0" - sources."@textlint/ast-traverse-12.0.0" - sources."@textlint/feature-flag-12.0.0" - sources."@textlint/fixer-formatter-12.0.0" - sources."@textlint/kernel-12.0.0" - sources."@textlint/linter-formatter-12.0.0" - sources."@textlint/markdown-to-ast-12.0.0" - sources."@textlint/module-interop-12.0.0" - sources."@textlint/source-code-fixer-12.0.0" - sources."@textlint/text-to-ast-12.0.0" - sources."@textlint/textlint-plugin-markdown-12.0.0" - sources."@textlint/textlint-plugin-text-12.0.0" - sources."@textlint/types-12.0.0" - sources."@textlint/utils-12.0.0" + sources."@textlint/ast-tester-12.0.2" + sources."@textlint/ast-traverse-12.0.2" + sources."@textlint/feature-flag-12.0.2" + sources."@textlint/fixer-formatter-12.0.2" + sources."@textlint/kernel-12.0.2" + sources."@textlint/linter-formatter-12.0.2" + sources."@textlint/markdown-to-ast-12.0.2" + sources."@textlint/module-interop-12.0.2" + sources."@textlint/source-code-fixer-12.0.2" + sources."@textlint/text-to-ast-12.0.2" + sources."@textlint/textlint-plugin-markdown-12.0.2" + sources."@textlint/textlint-plugin-text-12.0.2" + sources."@textlint/types-12.0.2" + sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.4" - sources."@types/unist-2.0.5" - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" + sources."@types/unist-2.0.6" + sources."ajv-8.6.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" + sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" sources."boundary-1.0.1" @@ -111244,8 +113515,9 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charenc-0.0.2" - sources."co-4.6.0" sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."crypt-0.0.2" sources."debug-4.3.2" @@ -111253,10 +113525,12 @@ in sources."deep-is-0.1.3" sources."define-properties-1.1.3" sources."diff-4.0.2" + sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" + sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -111281,7 +113555,7 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-date-object-1.0.4" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -111292,16 +113566,15 @@ in sources."is-utf8-0.2.1" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-1.0.0" sources."json5-2.2.0" - sources."jsonify-0.0.0" sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.21" + sources."lodash.clonedeep-4.5.0" + sources."lodash.truncate-4.4.2" sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" - sources."map-like-2.0.0" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { dependencies = [ @@ -111357,6 +113630,7 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" + sources."punycode-2.1.1" sources."rc-config-loader-3.0.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { @@ -111379,7 +113653,12 @@ in sources."resolve-1.20.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - sources."slice-ansi-0.0.4" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -111398,12 +113677,10 @@ in sources."strip-bom-2.0.0" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-3.8.3" // { + (sources."table-6.7.1" // { 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."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" ]; }) sources."text-table-0.2.0" @@ -111416,6 +113693,7 @@ in sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-parents-3.1.1" + sources."uri-js-4.4.1" sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.1" sources."vfile-message-2.0.4" @@ -111506,7 +113784,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-5.0.3" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."acorn-8.4.1" sources."acorn-jsx-5.3.2" sources."alex-9.1.0" @@ -111644,7 +113922,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -112013,7 +114291,7 @@ in dependencies = [ sources."@textlint/ast-node-types-4.4.3" sources."@types/structured-source-3.0.0" - sources."@types/unist-2.0.5" + sources."@types/unist-2.0.6" sources."bail-1.0.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" @@ -112130,7 +114408,7 @@ in sources."is-regex-1.1.3" sources."is-string-1.0.6" sources."is-symbol-1.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -112237,7 +114515,7 @@ in sources."is-regex-1.1.3" sources."is-string-1.0.6" sources."is-symbol-1.0.4" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."string.prototype.trimend-1.0.4" @@ -112301,13 +114579,12 @@ in }; dependencies = [ sources."@sindresorhus/is-3.1.2" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.2" - sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112607,7 +114884,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -112692,7 +114969,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.8" + sources."strtok3-6.1.3" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -112723,7 +115000,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -113319,7 +115596,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" + sources."@types/cors-2.8.12" sources."@types/node-14.17.5" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -113373,7 +115650,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.6" + sources."diff2html-3.4.7" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -113401,7 +115678,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-4.2.1" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" @@ -113527,7 +115804,7 @@ in sources."signals-1.0.0" sources."simple-swizzle-0.2.2" sources."snapsvg-0.5.1" - (sources."socket.io-4.1.2" // { + (sources."socket.io-4.1.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -113665,7 +115942,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internmap-1.0.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."lru-cache-6.0.0" @@ -113934,7 +116211,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -114195,13 +116472,13 @@ in src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.58.0" + sources."@types/vscode-1.58.1" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -114245,7 +116522,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -114285,7 +116562,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -114333,7 +116610,7 @@ in sources."inherits-2.0.4" sources."interpret-2.2.0" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -114391,7 +116668,7 @@ in sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" - sources."object-inspect-1.10.3" + sources."object-inspect-1.11.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."os-homedir-1.0.2" @@ -114852,8 +117129,8 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.0" - sources."@types/unist-2.0.5" + sources."@types/node-16.3.2" + sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" @@ -115207,7 +117484,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -115797,7 +118074,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.5.1" // { + (sources."bit-field-1.5.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."fs-extra-10.0.0" @@ -115963,7 +118240,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -116024,7 +118301,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -116201,7 +118478,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-3.0.1" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.0" // { @@ -116583,11 +118860,11 @@ in sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; }; dependencies = [ - sources."@types/eslint-7.2.14" + sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -116610,11 +118887,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001243" + sources."caniuse-lite-1.0.30001245" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.776" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -116699,7 +118976,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" @@ -116752,7 +119029,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117388,10 +119665,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.0.tgz"; - sha512 = "E0gb1fXb8xNScgewQmvAmNLrnEto6MOaKlfzITVzR+bbU80LeV/YdrLw536ffcwiUv0arKQyfR/WIweBFrKWbg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.0.tgz"; + sha512 = "buPr+byINi11QWrnhaHO4adV2pYDkn9V80dI8SbEXkbFmYoopk3NdvstQz62lnPVUbKnJSAg7Abj93fdLIIG/w=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.2" @@ -117406,16 +119683,18 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bencode-2.0.1" sources."bep53-range-1.1.0" sources."binary-search-1.3.6" sources."bitfield-4.0.0" - (sources."bittorrent-dht-10.0.0" // { + (sources."bittorrent-dht-10.0.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -117463,6 +119742,7 @@ in ]; }) sources."castv2-client-1.2.0" + sources."chalk-4.1.1" sources."charset-1.0.1" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -117473,7 +119753,9 @@ in ]; }) sources."chunk-store-stream-4.3.0" - sources."clivas-0.2.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."common-tags-1.8.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" @@ -117500,8 +119782,10 @@ in sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."err-code-3.0.1" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -117513,8 +119797,10 @@ in }) sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" + sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-7.1.7" + sources."has-flag-4.0.0" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" sources."http-parser-js-0.4.13" @@ -117528,6 +119814,7 @@ in sources."is-ascii-1.0.0" sources."is-docker-2.2.1" sources."is-file-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -117618,6 +119905,7 @@ in sources."ms-2.1.2" ]; }) + sources."require-directory-2.1.1" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" @@ -117646,12 +119934,15 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" + sources."string-width-4.2.2" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" ]; }) sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" @@ -117684,7 +119975,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.1.6" // { + (sources."webtorrent-1.2.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117694,11 +119985,15 @@ in ]; }) sources."winreg-1.2.4" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" + sources."y18n-5.0.8" + sources."yargs-17.0.1" + sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; meta = { @@ -117758,10 +120053,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.21.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.0.tgz"; - sha512 = "lUp4qhxfBlTieoV+pkLJq09QnwL8daYM+3abAvfRLUUKDQaKTS4hM3NjWNVdtVHS/Oc7IFY44F2K2VZ/q5kMAw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.21.1.tgz"; + sha512 = "13Ann9t+BdAmBKsPlSWoYCISUIo+UFcAVf+YQg9wc7HdLZ0FlIhL5Mhn9+l9GMeO2PGRYEiCEAMbNiGn36Y84g=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -117834,8 +120129,9 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-2.6.4" // { + (sources."@npmcli/arborist-2.7.1" // { dependencies = [ + sources."mkdirp-1.0.4" sources."semver-7.3.5" ]; }) @@ -117867,7 +120163,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.1" + sources."@types/node-15.14.2" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -118140,7 +120436,7 @@ in sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.4.0" + sources."is-core-module-2.5.0" sources."is-docker-1.1.0" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -118223,7 +120519,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-9.0.3" // { + (sources."make-fetch-happen-9.0.4" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -118256,7 +120552,7 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.3.3" + sources."minipass-fetch-1.3.4" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -118701,7 +120997,7 @@ in }) sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.1.1" + sources."inquirer-8.1.2" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" sources."locate-path-6.0.0" @@ -118716,6 +121012,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" + sources."rxjs-7.2.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -118726,6 +121023,7 @@ in ]; }) sources."supports-color-7.2.0" + sources."tslib-2.1.0" sources."type-fest-0.21.3" sources."which-2.0.2" ]; @@ -118765,7 +121063,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.2" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix new file mode 100644 index 00000000000..08bb426d8ab --- /dev/null +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitLab, buildDunePackage, ff, zarith, ctypes, tezos-rust-libs, alcotest }: + +buildDunePackage rec { + pname = "bls12-381"; + version = "0.3.15"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-bls12-381"; + rev = version; + sha256 = "1s8n657fsl2gs01p7v2ffpcfzymavifhhpriyx1gq5qh4zvvw4vr"; + }; + useDune2 = true; + + minimalOCamlVersion = "4.08"; + propagatedBuildInputs = [ + ff + zarith + ctypes + tezos-rust-libs + ]; + + checkInputs = [ + alcotest + ]; + + # This is a hack to work around the hack used in the dune files + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; + description = "OCaml binding for bls12-381 from librustzcash"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix new file mode 100644 index 00000000000..2e4e0518a52 --- /dev/null +++ b/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, ezjsonm +, zarith +, hex +, json-data-encoding +, json-data-encoding-bson +, alcotest +, crowbar +}: + +buildDunePackage { + pname = "data-encoding"; + version = "0.2.0"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "data-encoding"; + rev = "0.2"; + sha256 = "0d9c2ix2imqk4r0jfhnwak9laarlbsq9kmswvbnjzdm2g0hwin1d"; + }; + useDune2 = true; + + propagatedBuildInputs = [ + ezjsonm + zarith + hex + json-data-encoding + json-data-encoding-bson + ]; + + checkInputs = [ + alcotest + crowbar + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/nomadic-labs/data-encoding"; + description = "Library of JSON and binary encoding combinators"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix new file mode 100644 index 00000000000..2a51b377e88 --- /dev/null +++ b/pkgs/development/ocaml-modules/ff/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith, alcotest }: + +buildDunePackage rec { + pname = "ff"; + version = "0.4.0"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-ff"; + rev = version; + sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + zarith + ]; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + description = "OCaml implementation of Finite Field operations"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 61ecb65510c..8e503f5ddd2 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,16 +1,16 @@ { lib, fetchurl, buildDunePackage , repr, ppx_repr, fmt, logs, mtime, stdlib-shims -, cmdliner, progress, semaphore-compat +, cmdliner, progress, semaphore-compat, optint , alcotest, crowbar, re }: buildDunePackage rec { pname = "index"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "sha256-ycZi/TFLoGRloSpjYqH5FCHWP3eyiTCIDLESEn5inuI="; + sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c"; }; minimumOCamlVersion = "4.08"; @@ -28,6 +28,7 @@ buildDunePackage rec { progress repr semaphore-compat + optint ]; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index 16ef675c1f8..5955dda8ed9 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath +, alcotest-lwt, index, irmin, irmin-layers, irmin-test, ocaml_lwt, fpath, optint }: buildDunePackage rec { @@ -12,7 +12,7 @@ buildDunePackage rec { useDune2 = true; buildInputs = [ fpath ]; - propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt ]; + propagatedBuildInputs = [ index irmin irmin-layers ocaml_lwt optint ]; checkInputs = [ alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index c7eed70d9d9..673238843ff 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1db134221e82c424260a0e206b640fcb82902be35eea4137af2bcd9c98d3ac0f"; + sha256 = "fac7c032f472fb369378ad2d8fe77e7cd3b3c1c6a0d7bf59980b69528891b399"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix new file mode 100644 index 00000000000..5048a8fd06a --- /dev/null +++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar }: + +buildDunePackage { + pname = "json-data-encoding-bson"; + + inherit (json-data-encoding) version src useDune2 doCheck; + + propagatedBuildInputs = [ + json-data-encoding + ocplib-endian + ]; + + checkInputs = [ + crowbar + ]; + + meta = json-data-encoding.meta // { + description = "Type-safe encoding to and decoding from JSON (bson support)"; + }; +} diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix new file mode 100644 index 00000000000..6dfea612b10 --- /dev/null +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar }: + +buildDunePackage rec { + pname = "json-data-encoding"; + version = "0.8"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "json-data-encoding"; + rev = "v${version}"; + sha256 = "1c6m2qvi9bm6qjxc38p6cia1f66r0rb9xf6b8svlj3jjymvqw889"; + }; + useDune2 = true; + + propagatedBuildInputs = [ + uri + ]; + + checkInputs = [ + crowbar + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/nomadic-labs/json-data-encoding"; + description = "Type-safe encoding to and decoding from JSON"; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix new file mode 100644 index 00000000000..23caa894736 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, lwt +}: + +buildDunePackage rec { + pname = "lwt-watcher"; + version = "0.1"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = "v${version}"; + sha256 = "0kaf7py02i0dn9rvrbzxh4ljfg059wc8xvm093m9wy7lsa68rax9"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + lwt + ]; + + doCheck = true; + + meta = { + description = "One-to-many broadcast in Lwt"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/repr/default.nix b/pkgs/development/ocaml-modules/repr/default.nix index cd7e1e014e4..282d24d9b73 100644 --- a/pkgs/development/ocaml-modules/repr/default.nix +++ b/pkgs/development/ocaml-modules/repr/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "repr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz"; - sha256 = "sha256-2b0v5RwutvyidzEDTEb5p33IvJ+3t2IW+KVxYD1ufXQ="; + sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p"; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix index 7ef2c55c2c2..561015254d7 100644 --- a/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/pkgs/development/ocaml-modules/repr/ppx.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: +{ lib, buildDunePackage, ppx_deriving, ppxlib, repr, alcotest, hex }: buildDunePackage { pname = "ppx_repr"; diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix new file mode 100644 index 00000000000..7ac05cd62da --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/acl.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, resto, uri }: + +buildDunePackage { + pname = "resto-acl"; + inherit (resto) src version meta useDune2 doCheck; + + minimalOCamlVersion = "4.05"; + + propagatedBuildInputs = [ + resto + uri + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix new file mode 100644 index 00000000000..2dc651045ba --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix @@ -0,0 +1,20 @@ +{ buildDunePackage +, resto +, resto-directory +, resto-cohttp +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-cohttp + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix new file mode 100644 index 00000000000..88f2ef25e6a --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, resto-cohttp-client +, resto-cohttp-server +, uri +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-self-serving-client"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + resto-cohttp-client + resto-cohttp-server + uri + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix new file mode 100644 index 00000000000..61a5d93e9fc --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, resto +, resto-directory +, resto-acl +, resto-cohttp +, cohttp-lwt-unix +, conduit-lwt-unix +, lwt +}: + +buildDunePackage { + pname = "resto-cohttp-server"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + resto-acl + resto-cohttp + cohttp-lwt-unix + conduit-lwt-unix + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix new file mode 100644 index 00000000000..c29e589057c --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/cohttp.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, resto, resto-directory, cohttp-lwt }: + +buildDunePackage { + pname = "resto-cohttp"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + resto-directory + cohttp-lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix new file mode 100644 index 00000000000..13d55b1af21 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitLab, buildDunePackage, uri }: + +buildDunePackage rec { + pname = "resto"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "resto"; + rev = "v${version}"; + sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + uri + ]; + + # resto has infinite recursion in their tests + doCheck = false; + + meta = { + description = "A minimal OCaml library for type-safe HTTP/JSON RPCs"; + homepage = "https://gitlab.com/nomadic-labs/resto"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix new file mode 100644 index 00000000000..7539bf98ffd --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/directory.nix @@ -0,0 +1,11 @@ +{ lib, buildDunePackage, resto, resto-json, lwt }: + +buildDunePackage { + pname = "resto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto-directory.nix b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix new file mode 100644 index 00000000000..fa208cc3fbb --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto-directory.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, resto, resto-directory, ezresto, lwt }: + +buildDunePackage { + pname = "ezresto-directory"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + ezresto + resto-directory + resto + lwt + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/ezresto.nix b/pkgs/development/ocaml-modules/resto/ezresto.nix new file mode 100644 index 00000000000..8b3b2c6cd71 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/ezresto.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, resto-json, uri }: + +buildDunePackage { + pname = "ezresto"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + uri + resto + resto-json + ]; +} diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix new file mode 100644 index 00000000000..e861cac6d31 --- /dev/null +++ b/pkgs/development/ocaml-modules/resto/json.nix @@ -0,0 +1,12 @@ +{ lib, buildDunePackage, resto, json-data-encoding, json-data-encoding-bson }: + +buildDunePackage { + pname = "resto-json"; + inherit (resto) src version meta useDune2 doCheck; + + propagatedBuildInputs = [ + resto + json-data-encoding + json-data-encoding-bson + ]; +} diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix new file mode 100644 index 00000000000..f7d3c1e41c5 --- /dev/null +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, gmp +, dune-configurator +, cstruct +, bigstring +, alcotest +, hex +}: + +buildDunePackage rec { + pname = "secp256k1-internal"; + version = "0.2"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "ocaml-secp256k1-internal"; + rev = "v${version}"; + sha256 = "1g9fyi78nmmm19l2cggwj14m4n80rz7gmnh1gq376zids71s6qxv"; + }; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + gmp + cstruct + bigstring + ]; + + buildInputs = [ + dune-configurator + ]; + + checkInputs = [ + alcotest + hex + ]; + + doCheck = true; + + meta = { + description = "Bindings to secp256k1 internal functions (generic operations on the curve)"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 11413059533..c3a9224410d 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.14.2"; + version = "3.15.1"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-SFqSTNKZMETRf9RxSD6skzAVpxepmW+JG/gqZgFX06A="; + sha256 = "sha256-aUYerhg5iqKsZ5SW3dI6EpFnaB7dRGjXpIDVsjwS7vY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix index 4d6d91c5716..5ce9d196c4c 100644 --- a/pkgs/development/python-modules/advantage-air/default.nix +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "advantage_air"; - version = "0.2.2"; + version = "0.2.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version pname; - sha256 = "04q2sjw9r50c00m4sfv98w9cwmmr970830c97m32p5j8ijb10j5x"; + sha256 = "sha256-38csg1Cvpz4dkRCwlNc8+af7aJ5xDrZO1D8cCaBlePA="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 961a6cff196..a6c99e72c0a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; + sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 25264a66527..18364bdce69 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohttp-wsgi"; - version = "0.8.2"; + version = "0.9.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "etianen"; repo = pname; rev = version; - sha256 = "0wirn3xqxxgkpy5spicd7p1bkdnsrch61x2kcpdwpixmx961pq7x"; + sha256 = "sha256-lQ0mAUqsOmozUIMd6nwRATaq8C5SUFGoyQu1v0RBnas="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 68c34df1afb..20c068080c9 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,22 +1,22 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , aiohttp -, pytest +, pytestCheckHook , pytest-aiohttp , pygments -, lib }: buildPythonPackage rec { pname = "aiojobs"; - version = "0.2.2"; + version = "0.3.0"; format = "flit"; - disabled = isPy27; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "01a0msjh4w58fd7jplmblh0hwgpzwjs5xkgqz3d0p5yv3cykwjwf"; + sha256 = "sha256-9mMdQtxDCPfYg6u9cNTpdvP8w1o7oejq5dSvSUCh4MM="; }; nativeBuildInputs = [ @@ -28,13 +28,11 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook pytest-aiohttp ]; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "aiojobs" ]; meta = with lib; { homepage = "https://github.com/aio-libs/aiojobs"; diff --git a/pkgs/development/python-modules/aiosmb/default.nix b/pkgs/development/python-modules/aiosmb/default.nix index 86686d2055e..88c793f9cb5 100644 --- a/pkgs/development/python-modules/aiosmb/default.nix +++ b/pkgs/development/python-modules/aiosmb/default.nix @@ -5,6 +5,7 @@ , fetchPypi , minikerberos , prompt_toolkit +, pycryptodomex , pythonOlder , six , tqdm @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "aiosmb"; - version = "0.2.48"; + version = "0.2.49"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f5518987e3d41d213a4ffc4dd38362465b5d2cf99417014cb5402f8ee8c5abac"; + sha256 = "sha256-XCaAaY7a6Gdddm9B0ET+rVzFra5W0GTI/HUMuvpyhzM="; }; propagatedBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { colorama minikerberos prompt_toolkit + pycryptodomex six tqdm winacl @@ -35,6 +37,7 @@ buildPythonPackage rec { # Project doesn't have tests doCheck = false; + pythonImportsCheck = [ "aiosmb" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 092d3a53e94..285a125a725 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -13,6 +13,7 @@ , GitPython , itanium_demangler , mulpyplexer +, nampa , networkx , progressbar2 , protobuf @@ -42,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; + sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; }; propagatedBuildInputs = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { GitPython itanium_demangler mulpyplexer + nampa networkx progressbar2 protobuf @@ -83,7 +85,13 @@ buildPythonPackage rec { doCheck = false; # See http://angr.io/api-doc/ - pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ]; + pythonImportsCheck = [ + "angr" + "claripy" + "cle" + "pyvex" + "archinfo" + ]; meta = with lib; { description = "Powerful and user-friendly binary analysis platform"; diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index aa6f72eae54..e5ab1954276 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; + sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 580b05b82ad..60c3e8905b5 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; + sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index 4988a04e8e4..a11d1c70304 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - version = "0.8"; + version = "0.9"; pname = "asgi-csrf"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-0I/p9SjVVZhJQeR7s1R3tooP9XMNLPlcxl0dBSzsVaw="; + sha256 = "sha256-mmOsN2mW6eGtapq3xLqHK8hhSD0Gjzp3DsY5AGUlI8g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index b39a7290387..53cd4671d2c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -5,20 +5,21 @@ , numba , numpy , pytestCheckHook +, pyyaml , rapidjson }: buildPythonPackage rec { pname = "awkward"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b6021694adec9813842bad1987b837e439dabaf5b0dff9041201d238fca71fb4"; + sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ rapidjson ]; + buildInputs = [ pyyaml rapidjson ]; propagatedBuildInputs = [ numpy ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 166ba0b7249..bad8ee9bd2d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.36.0"; + version = "1.37.0"; src = fetchPypi { inherit pname version; - sha256 = "fa1b990d9329d19052e7b91cf0b19371ed9d31a529054b616005884cd662b584"; + sha256 = "0p2qd8gwxsfq17nmrlkpf31aqbfzjrwjk3n4p8vhci8mm11dk138"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index aecc904af50..d035e413351 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.12.0"; + version = "0.12.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk="; + sha256 = "1va9138igcgbpsnzgr90qwprmhr9h8lryqslc22jxra4r56a502a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 639dc53babf..9b02160dc4e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , filelock , flit-core , importlib-metadata @@ -8,6 +8,7 @@ , packaging , pep517 , pytest-mock +, pytest-rerunfailures , pytest-xdist , pytestCheckHook , pythonOlder @@ -17,13 +18,14 @@ buildPythonPackage rec { pname = "build"; - version = "0.3.0"; - + version = "0.5.1"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-DrlbLI13DXxMm5LGjCJ8NQu/ZfPsg1UazpCXwYzBX90="; + src = fetchFromGitHub { + owner = "pypa"; + repo = pname; + rev = version; + sha256 = "15hc9mbxsngfc9n805x8rk7yqbxnw12mpk6hfwcsldnfii1vg2ph"; }; nativeBuildInputs = [ @@ -42,20 +44,18 @@ buildPythonPackage rec { checkInputs = [ filelock - pytestCheckHook pytest-mock + pytest-rerunfailures pytest-xdist + pytestCheckHook ]; disabledTests = [ "test_isolation" "test_isolated_environment_install" "test_default_pip_is_never_too_old" - "test_build_isolated - StopIteration" - "test_build_raises_build_exception" - "test_build_raises_build_backend_exception" - "test_projectbuilder.py" - "test_projectbuilder.py" + "test_build" + "test_init" ]; pythonImportsCheck = [ "build" ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index d8257f446d1..2c25d258e57 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; + sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 87091509fb0..d6731260937 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.8761"; + version = "9.0.9031"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; + sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/convertdate/2.2.x.nix b/pkgs/development/python-modules/convertdate/2.2.x.nix index d67f4c5a344..1145a61ca4f 100644 --- a/pkgs/development/python-modules/convertdate/2.2.x.nix +++ b/pkgs/development/python-modules/convertdate/2.2.x.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; + sha256 = "07x1j6jgkmrzdpv2lhpp4n16621mpmlylvwdwsggdjivhzvc3x9q"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cramjam/Cargo.lock b/pkgs/development/python-modules/cramjam/Cargo.lock new file mode 100644 index 00000000000..0eb5882cc36 --- /dev/null +++ b/pkgs/development/python-modules/cramjam/Cargo.lock @@ -0,0 +1,520 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "brotli-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "brotli2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +dependencies = [ + "brotli-sys", + "libc", +] + +[[package]] +name = "cc" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cramjam" +version = "2.3.2" +dependencies = [ + "brotli2", + "flate2", + "lz4", + "mimalloc", + "numpy", + "pyo3", + "snap", + "zstd", +] + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "ctor" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "flate2" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "ghost" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "inventory" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f" +dependencies = [ + "ctor", + "ghost", + "inventory-impl", +] + +[[package]] +name = "inventory-impl" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jobserver" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" + +[[package]] +name = "libmimalloc-sys" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2396cf99d2f58611cd69f0efeee4af3d2e2c7b61bed433515029163aa567e65c" +dependencies = [ + "cc", +] + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "lz4" +version = "1.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" +dependencies = [ + "libc", + "lz4-sys", +] + +[[package]] +name = "lz4-sys" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "matrixmultiply" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" +dependencies = [ + "rawpointer", +] + +[[package]] +name = "mimalloc" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7c6b11afd1e5e689ac96b6d18b1fc763398fe3d7eed99e8773426bc2033dfb" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "ndarray" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", +] + +[[package]] +name = "num-complex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "numpy" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7073fae1e0b82409533a29c6f804b79783d7b2d3c07728fdc4d884eda8cd4f0" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "ndarray", + "num-complex", + "num-traits", + "pyo3", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "pyo3" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4837b8e8e18a102c23f79d1e9a110b597ea3b684c95e874eb1ad88f8683109c3" +dependencies = [ + "cfg-if 1.0.0", + "ctor", + "indoc", + "inventory", + "libc", + "parking_lot", + "paste", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-macros" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47f2c300ceec3e58064fd5f8f5b61230f2ffd64bde4970c81fdd0563a2db1bb" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87b097e5d84fcbe3e167f400fbedd657820a375b034c78bd852050749a575d66" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "redox_syscall" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "snap" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" + +[[package]] +name = "syn" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zstd" +version = "0.6.1+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "3.0.1+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "1.4.20+zstd.1.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" +dependencies = [ + "cc", + "libc", +] diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix new file mode 100644 index 00000000000..4d1227dcbc5 --- /dev/null +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, rustPlatform +, libiconv +, pytestCheckHook +, brotli +, lz4 +, memory_profiler +, numpy +, pytest-benchmark +, python-snappy +, zstd +}: + +buildPythonPackage rec { + pname = "cramjam"; + version = "2.3.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "577955f1510d99df0e4d61379c3f05568f594f91e12bc6a7e147d0abfa643a3b"; + }; + + postPatch = '' + cp ${./Cargo.lock} ./Cargo.lock + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + + checkInputs = [ + pytestCheckHook + brotli + lz4 + memory_profiler + numpy + pytest-benchmark + python-snappy + zstd + ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "cramjam" ]; + + meta = with lib; { + description = "Thin Python bindings to de/compression algorithms in Rust"; + homepage = "https://crates.io/crates/cramjam"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index a5ae90c57e3..127e6f92933 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -2,19 +2,15 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.1.13"; + version = "0.2.0"; disabled = pythonOlder "3.6"; - patchPhase = '' - substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' - ''; - src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; rev = version; - sha256 = "sha256-KJRfkUyUI0M7HevY4XKOtCvU+SFlsJIl3kTIccWfNmw="; + sha256 = "sha256-Kuc7g5+4TIcQTWYjG4uPN0Rxfom/A/xpek5K5ErlbdU="; }; propagatedBuildInputs = [ pysha3 setuptools ]; diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix index 0983805780f..ac574174278 100644 --- a/pkgs/development/python-modules/dill/default.nix +++ b/pkgs/development/python-modules/dill/default.nix @@ -1,37 +1,47 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , isPy27 -, nose +, pytestCheckHook }: buildPythonPackage rec { pname = "dill"; - version = "0.3.1.1"; + version = "0.3.4"; + doCheck = !isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c"; + src = fetchFromGitHub { + owner = "uqfoundation"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm"; }; - # python2 can't import a test fixture - doCheck = !isPy27; - checkInputs = [ nose ]; - checkPhase = '' - PYTHONPATH=$PWD/tests:$PYTHONPATH - nosetests \ - --ignore-files="test_classdef" \ - --ignore-files="test_objects" \ - --ignore-files="test_selected" \ - --exclude="test_the_rest" \ - --exclude="test_importable" - ''; + checkInputs = [ + pytestCheckHook + ]; + # Tests seem to fail because of import pathing and referencing items/classes in modules. # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests. + disabledTestPaths = [ + "tests/test_diff.py" + "tests/test_module.py" + "tests/test_objects.py" + ]; + + disabledTests = [ + "test_class_objects" + "test_method_decorator" + "test_importable" + "test_the_rest" + ]; + + pythonImportsCheck = [ "dill" ]; - meta = { + meta = with lib; { description = "Serialize all of python (almost)"; homepage = "https://github.com/uqfoundation/dill/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index dc25759afe3..c0694a58cb7 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -1,23 +1,43 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numba, numpy, pandas, pytestrunner -, thrift, pytestCheckHook, python-snappy, lz4, zstandard, zstd }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, numba +, numpy +, pandas +, pytestrunner +, cramjam +, fsspec +, thrift +, pytestCheckHook +}: buildPythonPackage rec { pname = "fastparquet"; - version = "0.5.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "17i091kky34m2xivk29fqsyxxxa7v4352n79w01n7ni93za6wana"; + hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; }; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ numba numpy pandas thrift ]; - checkInputs = [ pytestCheckHook python-snappy lz4 zstandard zstd ]; + propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; + checkInputs = [ pytestCheckHook ]; + + # Workaround https://github.com/NixOS/nixpkgs/issues/123561 + preCheck = '' + mv fastparquet/test . + rm -rf fastparquet + fastparquet_test="$out"/${python.sitePackages}/fastparquet/test + ln -s `pwd`/test "$fastparquet_test" + ''; + postCheck = '' + rm "$fastparquet_test" + ''; - # E ModuleNotFoundError: No module named 'fastparquet.speedups' - doCheck = false; pythonImportsCheck = [ "fastparquet" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/garminconnect-ha/default.nix b/pkgs/development/python-modules/garminconnect-ha/default.nix index e3d4cd5b48e..c88af9b230e 100644 --- a/pkgs/development/python-modules/garminconnect-ha/default.nix +++ b/pkgs/development/python-modules/garminconnect-ha/default.nix @@ -1,21 +1,23 @@ { lib , buildPythonPackage +, cloudscraper , fetchFromGitHub , requests }: buildPythonPackage rec { pname = "garminconnect-ha"; - version = "0.1.6"; + version = "0.1.13"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect-ha"; rev = version; - sha256 = "0ngas6zikhpja1cdkq64m9pjm4b0z3qaj9g3x88mggy60jsxm1d7"; + sha256 = "sha256-1O1EcG5FvpwUvI8rwcdlQLzEEStyFAwvmkaL97u6hZ4="; }; propagatedBuildInputs = [ + cloudscraper requests ]; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 5ebaac9cea5..0526a584a41 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; - maintainers = with maintainers; [ va1entin ]; }; } diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 693a4221ee0..6b05bb72283 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.1.0"; + version = "2.2.0"; disabled = !isPy3k; # only Python 3 src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; + sha256 = "sha256-zFz0T/M/CABKkChuiKsFkWj2pphZuFeE5gz0HxZYaz8="; }; propagatedBuildInputs = [ geographiclib ]; diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix new file mode 100644 index 00000000000..50140ef8308 --- /dev/null +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkgs +, python +}: + +buildPythonPackage rec { + pname = "gruut-ipa"; + version = "0.9.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0="; + }; + + postPatch = '' + patchShebangs bin/speak-ipa + substituteInPlace bin/speak-ipa \ + --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ + --replace "do espeak" "do ${pkgs.espeak}/bin/espeak" + ''; + + postInstall = '' + install -m0755 bin/speak-ipa $out/bin/speak-ipa + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "gruut_ipa" + ]; + + meta = with lib; { + description = "Library for manipulating pronunciations using the International Phonetic Alphabet (IPA)"; + homepage = "https://github.com/rhasspy/gruut-ipa"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix new file mode 100644 index 00000000000..75d0c365e61 --- /dev/null +++ b/pkgs/development/python-modules/gruut/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, callPackage +, pythonOlder +, fetchFromGitHub +, Babel +, gruut-ipa +, jsonlines +, num2words +, python-crfsuite +, dataclasses +, python +}: + +let + langPkgs = [ + "cs" + "de" + "es" + "fr" + "it" + "nl" + "pt" + "ru" + "sv" + "sw" + ]; +in +buildPythonPackage rec { + pname = "gruut"; + version = "1.2.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rhasspy"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qY4xsoVk1hyY9dYmVXaqDRjcShUQmp8VZOzAQNiC6EM="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "Babel~=2.8.0" "Babel" + ''; + + propagatedBuildInputs = [ + Babel + gruut-ipa + jsonlines + num2words + python-crfsuite + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ] ++ (map (lang: callPackage ./language-pack.nix { + inherit lang version format src; + }) langPkgs); + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ + "gruut" + ]; + + meta = with lib; { + description = "A tokenizer, text cleaner, and phonemizer for many human languages"; + homepage = "https://github.com/rhasspy/gruut"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/gruut/language-pack.nix b/pkgs/development/python-modules/gruut/language-pack.nix new file mode 100644 index 00000000000..2d3cfa9cc51 --- /dev/null +++ b/pkgs/development/python-modules/gruut/language-pack.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage + +, lang +, version +, format +, src +}: + +buildPythonPackage rec { + pname = "gruut-lang-${lang}"; + inherit version format src; + + prePatch = '' + cd "${pname}" + ''; + + pythonImportsCheck = [ + "gruut_lang_${lang}" + ]; + + doCheck = false; + + meta = with lib; { + description = "Language files for gruut tokenizer/phonemizer"; + homepage = "https://github.com/rhasspy/gruut"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix new file mode 100644 index 00000000000..5f384283536 --- /dev/null +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, pythonOlder +, typing-extensions +, wsproto +, toml +, h2 +, priority +, mock +, pytest-asyncio +, pytest-cov +, pytest-sugar +, pytest-trio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "Hypercorn"; + version = "0.11.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "pgjones"; + repo = pname; + rev = version; + sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh"; + }; + + propagatedBuildInputs = [ wsproto toml h2 priority ] + ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + + checkInputs = [ + pytest-asyncio + pytest-cov + pytest-sugar + pytest-trio + pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; + + pythonImportsCheck = [ "hypercorn" ]; + + meta = with lib; { + homepage = "https://pgjones.gitlab.io/hypercorn/"; + description = "The ASGI web server inspired by Gunicorn"; + license = licenses.mit; + maintainers = with maintainers; [ dgliwka ]; + }; +} diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 15850707b18..7e753e2e059 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si"; + sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 57fee2664cd..2b9f87fdd81 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -1,16 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, six }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "langdetect"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0c5zm6c7xzsigbb9c7v4r33fcpz911zscfwvh3dq1qxdy3ap18ci"; + sha256 = "1805svvb7xjm4sf1j7b6nc3409x37pd1xmabfwwjf1ldkzwgxhfb"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "langdetect" ]; meta = with lib; { description = "Python port of Google's language-detection library"; diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 9feb5b1d242..5cc36906610 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -1,14 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, libsass, six, pytest, werkzeug }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, libsass +, six +, pytestCheckHook +, werkzeug +}: buildPythonPackage rec { pname = "libsass"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "sass"; repo = "libsass-python"; rev = version; - sha256 = "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh"; + sha256 = "sha256-4doz3kkRlyfVfeUarYw2tcybeDVeE2jpgmHxFJsPiVc="; }; buildInputs = [ libsass ]; @@ -20,16 +27,16 @@ buildPythonPackage rec { ''; checkInputs = [ - pytest + pytestCheckHook werkzeug ]; - checkPhase = '' - pytest sasstests.py - ''; + pytestFlagsArray = [ "sasstests.py" ]; + + pythonImportsCheck = [ "sass" ]; meta = with lib; { - description = "A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all!"; + description = "Python binding for libsass to compile Sass/SCSS"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index b543002bc07..c62e4c74576 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE="; + sha256 = "sha256-TNDQV1BOVVdvr0XAyWGcwgMbe4mV7J05hQeKVUqVT9s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 6c1ba9a40c6..99d94d3d1a8 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch"; sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648"; }) + # fix white space error in the tests for exiftool, remove for next release + (fetchpatch { + name = "fix-tests-exiftool.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch"; + sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x"; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix new file mode 100644 index 00000000000..9f572d141c7 --- /dev/null +++ b/pkgs/development/python-modules/nampa/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nampa"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "thebabush"; + repo = pname; + rev = version; + sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/thebabush/nampa/pull/13 + substituteInPlace setup.py \ + --replace "0.1.1" "${version}" + ''; + + pythonImportsCheck = [ "nampa" ]; + + meta = with lib; { + description = "Python implementation of the FLIRT technology"; + homepage = "https://github.com/thebabush/nampa"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 5a2b5f7284a..5e07d6331ac 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.8"; + version = "0.9.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-KjA3AnrMg4ySKSY2FDHVo0Zh9GoLUWiQDuUzo8d5At8="; + sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d4817480e57..597b6814281 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "4.0.3"; + version = "4.0.4"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "CLcmwobPrL6NiI/nw+/Dwho/r15owV16Jmt5OcfFqvo="; + sha256 = "g5G818Gq5EGyRIyg/ZW7guxMS0IyJ4nYaRjG/CtGhuc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix new file mode 100644 index 00000000000..d95aa846965 --- /dev/null +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, autopep8 +, nose +, pycodestyle +, twine +}: + +buildPythonPackage rec { + pname = "opensimplex"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "lmas"; + repo = pname; + rev = "v${version}"; + sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + }; + + checkInputs = [ autopep8 nose pycodestyle twine ]; + checkPhase = '' + nosetests tests/ + ''; + + meta = with lib; { + description = "OpenSimplex Noise functions for 2D, 3D and 4D"; + longDescription = '' + OpenSimplex noise is an n-dimensional gradient noise function that was + developed in order to overcome the patent-related issues surrounding + Simplex noise, while continuing to also avoid the visually-significant + directional artifacts characteristic of Perlin noise. + ''; + homepage = "https://github.com/lmas/opensimplex"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ angustrau ]; + }; +} diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index ad043e9f59e..c37c428805e 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.6"; + version = "1.1.7"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-3Nx9xuQMIho+oRjqskHL9eQGKDAWntEGZcWe7evnmNU="; + sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index f664d9c6d25..212fdf6a721 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -1,9 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, fetchPypi , git -, isPy27 -, lib +, pythonOlder , pytestCheckHook , ruamel_yaml , toml @@ -11,19 +10,25 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "3.4.0"; - disabled = isPy27; + version = "4.0.1"; + disabled = pythonOlder "3.6"; - # fetchPypi does not provide tests src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "1aqkmprdc2lhds9c59pkkf2js65j63197flanaggk7cm8k0kz7zs"; + sha256 = "sha256-Rg2I79r0Pp3AUgT6mD+kEdm+5CEGgdmFn6G3xcU6fnk="; }; - propagatedBuildInputs = [ toml ruamel_yaml ]; - checkInputs = [ git pytestCheckHook ]; + propagatedBuildInputs = [ + ruamel_yaml + toml + ]; + + checkInputs = [ + git + pytestCheckHook + ]; # the tests require a functional git installation which requires a valid HOME # directory. @@ -34,6 +39,8 @@ buildPythonPackage rec { git config --global user.email "nix-builder@nixos.org" ''; + pythonImportsCheck = [ "pre_commit_hooks" ]; + meta = with lib; { description = "Some out-of-the-box hooks for pre-commit"; homepage = "https://github.com/pre-commit/pre-commit-hooks"; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index c8fde03d79d..866b2bdcadf 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -1,8 +1,15 @@ -{ buildPythonPackage, isPy3k, lib, fetchFromGitHub, setuptools-scm, toml, pytest }: +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, setuptools-scm +, toml +, pytestCheckHook +}: buildPythonPackage rec { pname = "pure_eval"; - version = "0.1.0"; + version = "0.2.1"; disabled = !isPy3k; @@ -10,15 +17,24 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; + sha256 = "sha256-+Vucu16NFPtQ23AbBH/cQU+klxp6DMicSScbnKegLZI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ toml ]; + buildInputs = [ + setuptools-scm + ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pure_eval" ]; meta = with lib; { description = "Safely evaluate AST nodes without side effects"; diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index acb9b73403b..919ab61c60c 100644 --- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -4,19 +4,21 @@ }: buildPythonPackage rec { pname = "pure-python-adb-homeassistant"; - version = "0.1.6.dev0"; + version = "0.1.7.dev0"; src = fetchPypi { inherit pname version; - sha256 = "fe6d90220a6880649f6d6df4e707ce5034676710ee6146145ef995f7b769a482"; + sha256 = "sha256-xXXEp8oYGcJLTfoBDUSZrIHSgDvB2EHbVMHoG4Hk+t8="; }; # Disable tests as they require docker, docker-compose and a dedicated # android emulator doCheck = false; + pythonImportsCheck = [ "adb_messenger" ]; + meta = with lib; { - description = "Pure python implementation of the adb client"; + description = "Python implementation of the ADB client"; homepage = "https://github.com/JeffLIrion/pure-python-adb"; license = licenses.mit; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/development/python-modules/push-receiver/default.nix b/pkgs/development/python-modules/push-receiver/default.nix new file mode 100644 index 00000000000..fe0582f0962 --- /dev/null +++ b/pkgs/development/python-modules/push-receiver/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib +, appdirs +, http-ece +, oscrypto +, protobuf +}: + +buildPythonPackage rec { + pname = "push-receiver"; + version = "0.1.1"; + + src = fetchPypi { + inherit version; + pname = "push_receiver"; + sha256 = "sha256-Tknmra39QfA+OgrRxzKDLbkPucW8zgdHqz5FGQnzYOw="; + }; + + propagatedBuildInputs = [ + appdirs # required for running the bundled example + http-ece # required for listening for new message + oscrypto + protobuf + ]; + + pythonImportsCheck = [ "push_receiver" ]; + + meta = with lib; { + homepage = "https://github.com/Francesco149/push_receiver"; + description = "Subscribe to GCM/FCM and receive notifications"; + license = licenses.unlicense; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index e3422aff024..d0ea1b19849 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.5.1"; + version = "4.6.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "97f945aed7ffa9d3e87f8759df83a5eac6dc2112907f35d0aee66a9bf62fd8eb"; + sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index 4535767a69c..c5127be1a87 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , astropy , astropy-helpers , pillow @@ -9,29 +9,35 @@ buildPythonPackage rec { pname = "pyavm"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { pname = "PyAVM"; inherit version; - sha256 = "f298b864e5bc101ecbb0e46252e95e18a180ac28ba6ec362e63c12a7e914e386"; + sha256 = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8="; }; - propagatedBuildInputs = [ astropy-helpers ]; + propagatedBuildInputs = [ + astropy-helpers + ]; - checkInputs = [ pytest astropy pillow ]; - - checkPhase = "pytest"; + checkInputs = [ + astropy + pillow + pytestCheckHook + ]; # Disable automatic update of the astropy-helper module postPatch = '' substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" ''; + pythonImportsCheck = [ "pyavm" ]; + meta = with lib; { description = "Simple pure-python AVM meta-data handling"; - homepage = "http://astrofrog.github.io/pyavm/"; + homepage = "https://astrofrog.github.io/pyavm/"; license = licenses.mit; - maintainers = [ maintainers.smaret ]; + maintainers = with maintainers; [ smaret ]; }; } diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 487f7ca66f3..f69a21115f2 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -1,38 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub -# Runtime inputs: -, pyparsing -# Check inputs: -, pytest , mock +, pyparsing +, pytestCheckHook +, python-dateutil }: buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.53"; + version = "0.3.58"; src = fetchFromGitHub { owner = "chimpler"; repo = "pyhocon"; rev = version; - sha256 = "1lr56piiasnq1aiwli8ldw2wc3xjfck8az991mr5rdbqqsrh9vkv"; + sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU="; }; - propagatedBuildInputs = [ pyparsing ]; + propagatedBuildInputs = [ + pyparsing + python-dateutil + ]; - checkInputs = [ pytest mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; - # Tests fail because necessary data files aren't packaged for PyPi yet. - # See https://github.com/chimpler/pyhocon/pull/203 - doCheck = false; + pythonImportsCheck = [ "pyhocon" ]; meta = with lib; { homepage = "https://github.com/chimpler/pyhocon/"; description = "HOCON parser for Python"; - # Long description copied from - # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py - # (the tip of master as of 2019-03-24). + # taken from https://pypi.org/project/pyhocon/ longDescription = '' A HOCON parser for Python. It additionally provides a tool (pyhocon) to convert any HOCON content into json, yaml and properties diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index ebd6aeb0fee..f8696dd54ac 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "nacl" ]; meta = with lib; { - maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 3d39b3516b6..b0ea3fdcb24 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.9"; + version = "0.7.10"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "0clpi6bplzw7qg2m0hgwqr71zwxrh901gwprhd1yjykn30njp5bw"; + sha256 = "sha256-B2imewEONewj1Y+Q316reIBZB/b9WQAu67x9cLMkRTU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 5b0dfb29be2..b547d030ced 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -1,4 +1,5 @@ { lib +, appdirs , buildPythonPackage , defusedxml , fetchFromGitHub @@ -17,13 +18,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-9qkNQ3+yDplPHIXDwlghpJP1f+UoDYObWpPhl6UVtHU="; + sha256 = "sha256-S39rl8bJsxYAmTcaZk9+s9G45lOvREjlGVBk1m30tJo="; }; propagatedBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { ]; buildInputs = [ + appdirs defusedxml marshmallow python-box diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix new file mode 100644 index 00000000000..cd2adc48c6f --- /dev/null +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-crfsuite"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ryfcdfpqbrf8rcd2rlay2gfiba3px3q508543jf81shrv93hi9v"; + }; + + preCheck = '' + # make sure import the built version, not the source one + rm -r pycrfsuite + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pycrfsuite" + ]; + + meta = with lib; { + description = "Python binding for CRFsuite"; + homepage = "https://github.com/scrapinghub/python-crfsuite"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 6a2c396ecf8..90ab506d651 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -19,6 +19,7 @@ , python-lsp-jsonrpc , pythonOlder , rope +, setuptools , ujson , yapf }: @@ -47,6 +48,7 @@ buildPythonPackage rec { pylint python-lsp-jsonrpc rope + setuptools ujson yapf ]; diff --git a/pkgs/development/python-modules/python-registry/default.nix b/pkgs/development/python-modules/python-registry/default.nix index 44795da8ddf..fbf8df7f322 100644 --- a/pkgs/development/python-modules/python-registry/default.nix +++ b/pkgs/development/python-modules/python-registry/default.nix @@ -1,16 +1,20 @@ { lib , buildPythonPackage -, fetchPypi , enum-compat +, fetchFromGitHub +, pytestCheckHook , unicodecsv }: + buildPythonPackage rec { pname = "python-registry"; - version = "1.3.1"; + version = "1.4"; - src = fetchPypi { - inherit pname version; - sha256 = "99185f67d5601be3e7843e55902d5769aea1740869b0882f34ff1bd4b43b1eb2"; + src = fetchFromGitHub { + owner = "williballenthin"; + repo = pname; + rev = version; + sha256 = "0gwx5jcribgmmbz0ikhz8iphz7yj2d2nmk24nkdrjd3y5irly11s"; }; propagatedBuildInputs = [ @@ -18,8 +22,13 @@ buildPythonPackage rec { unicodecsv ]; - # no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "samples" + ]; pythonImportsCheck = [ "Registry" diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 412b032db7f..07f21881c50 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.19.1"; + version = "2.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zDT8VskHEX4uldMvxnb9A+FKMuvZbtEcmdVl5mghTs4="; + sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b2f43db50cf..d021b6b06d3 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; + sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ratelim/default.nix b/pkgs/development/python-modules/ratelim/default.nix new file mode 100644 index 00000000000..8fc3323ce1b --- /dev/null +++ b/pkgs/development/python-modules/ratelim/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +}: + +buildPythonPackage rec { + pname = "ratelim"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "07dirdd8y23706110nb0lfz5pzbrcvd9y74h64la3y8igqbk4vc2"; + }; + + propagatedBuildInputs = [ + decorator + ]; + + pythonImportsCheck = [ "ratelim" ]; + + # package has no tests + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/themiurgo/ratelim"; + description = "Simple Python library that limits the number of times a function can be called during a time interval"; + license = licenses.mit; + maintainers = with maintainers; [ dgliwka ]; + }; +} diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index e2ed5367df5..64dafa7bca2 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-P7JzImidUXOD4DUMdfy3sgM5RISti23wNnLwDHPoiTA="; + sha256 = "sha256-Ai/8l2p3S/NE+uyz3eQ+rJSD/xYCsXf89aYijINQ18I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index 7bd42670688..a177d22f5d4 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.5"; + version = "0.13.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA="; + sha256 = "sha256-CnL514LpaLCbEU1WB/lrHxb+mUKFevs1U5nt1VNy/PE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a6a5ce1fcd1..9b387582252 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mQetvdMKVbgYkUUSzBQ+a+rguzuniyZJ9LB5dS6w5CQ="; + sha256 = "sha256-UhCnEt1X2I0iXB/D/jo2Jv7kk2N7zVTiBIJs8EuNdpw="; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index 2d29797b28f..c712edf5ca8 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simanneal"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "perrygeo"; repo = "simanneal"; rev = version; - sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840"; + sha256 = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index c1a950dc2ae..24812deb1f9 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82"; + sha256 = "0l2b66z5ngyas3ijbzwz2wizw46kz47f8jr729pzbg4wbqbqjihr"; }; propagatedBuildInputs = [ skytemple-files ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 862789ce569..a52d3144aad 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -11,9 +11,7 @@ , isPy3k , psutil , pytest-asyncio -, pytest-cov , pytestCheckHook -, pytestrunner , sqlalchemy , websocket-client , websockets @@ -21,14 +19,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.7.0"; + version = "3.8.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "0bc52v5n8r3b2fy1c90w253r1abl752kaqdk6bgzkwsvbhgcxf2s"; + sha256 = "sha256-r3GgcU4K2jj+4aIytpY2HiVqHzChynn2BCn1VNTL2t0="; }; propagatedBuildInputs = [ @@ -47,20 +45,23 @@ buildPythonPackage rec { flask-sockets psutil pytest-asyncio - pytest-cov pytestCheckHook - pytestrunner ]; preCheck = '' export HOME=$(mktemp -d) ''; - # Exclude tests that requires network features - pytestFlagsArray = [ "--ignore=integration_tests" ]; + disabledTestPaths = [ + # Exclude tests that requires network features + "integration_tests" + ]; + disabledTests = [ + # Requires network features "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" "test_org_installation" + "test_interactions" ]; pythonImportsCheck = [ "slack_sdk" ]; diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index f529a8a00b0..cbbd3a878d7 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - pname = "stack_data"; - version = "0.0.7"; + pname = "stack-data"; + version = "0.1.0"; src = fetchFromGitHub { owner = "alexmojaki"; - repo = pname; + repo = "stack_data"; rev = "v${version}"; - sha256 = "148lhxihak8jm5dvryhsiykmn3s4mrlba8ki4dy1nbd8jnz06a4w"; + sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,6 +45,14 @@ buildPythonPackage rec { typeguard ]; + disabledTests = [ + # AssertionError + "test_variables" + "test_example" + ]; + + pythonImportsCheck = [ "stack_data" ]; + meta = with lib; { description = "Extract data from stack frames and tracebacks"; homepage = "https://github.com/alexmojaki/stack_data/"; diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 6ed265f6561..56dbc588c78 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.13"; + version = "0.3.14"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; - rev = "subaru-v${version}"; - sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g"; + rev = "v${version}"; + sha256 = "0xwiw50xc0k8r00k33crsl5wb01n2dz5rzhy96y7vr3zj4kfypsp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index e20536b30eb..502eb5c4f68 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.11"; + version = "1.1.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fVUYrzIcW4jbxdhS/Bh8eu+aJPFOqj0LXjoQKw+FZdg="; + sha256 = "sha256-J7jh8FufGQzYbVhdOPbIpZCjfWZV6oOShy82QXL82b4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 5f054e6b996..bc70f30f959 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libselinux, libsepol, shared-mime-info, libthai, libdatrie +, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , CoreServices, DarwinTools, cctools }@args: @@ -187,6 +187,11 @@ in buildInputs = [ openssl ]; }; + exif = attrs: { + buildFlags = [ "--with-exif-dir=${libexif}" ]; + buildInputs = [ libexif ]; + }; + ffi = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libffi ]; diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index c8dba514208..7ba8c70a980 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -242,7 +242,10 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs; passthru = passthru // { isRubyGem = true; }; - inherit meta; + meta = { + # default to Ruby's platforms + platforms = ruby.meta.platforms; + } // meta; }) ) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 599908b4931..8ac0958ffdd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.154.0"; + version = "0.155.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QqTHhcEgMfq4+1G3aSAvcyU26kNKiFc3vOTyFRo8l40="; + sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index ab82aed8e5e..9d87cb30520 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "23.0-rc1"; + version = "23.0"; slang = "Vanadium"; src = fetchurl { - url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "1z9f9a217bav3vfc99kq57d5rza6j7hr91ndviwkgcaib6wc5hcv"; + url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; + sha256 = "0pdm3y2nfyjhpnicv1pg9j48llq86dmb591d2imnafp4xfqani0s"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index da0e0554bf7..af47f65d298 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -1,17 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoPackage +, fetchFromGitHub +}: buildGoPackage rec { pname = "tfsec"; - version = "0.41.0"; + version = "0.48.7"; src = fetchFromGitHub { - owner = "tfsec"; + owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MK5cWRPGty7S4pkRZJRZF5qitoPM3im8JJW2J3yQqFo="; + sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I="; }; - goPackagePath = "github.com/tfsec/tfsec"; + goPackagePath = "github.com/aquasecurity/tfsec"; ldflags = [ "-w" @@ -20,9 +23,9 @@ buildGoPackage rec { ]; meta = with lib; { - homepage = "https://github.com/tfsec/tfsec"; - description = "Static analysis powered security scanner for your terraform code"; + description = "Static analysis powered security scanner for terraform code"; + homepage = "https://github.com/aquasecurity/tfsec"; license = licenses.mit; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ fab marsam ]; }; } diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 3837e2e3707..f07bcdd5fd5 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.23.0"; + version = "1.26.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0j0q6p08c3l9z0yc2cggw797k47cjh6ljpchiqgg0fh6mk32215f"; + sha256 = "11aqdwhs7wa6cp9zijqi4in3zvwirfnlcy45rrnsq0jdsh3i9hbh"; }; # Tests are not included in the PyPI package @@ -40,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ + --replace "click~=7.1" "click~=8.0" \ + --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "requests==2.23.0" "requests~=2.24" \ diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix new file mode 100644 index 00000000000..9396821f8c6 --- /dev/null +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, config +, fetchurl +, unzip +, makeWrapper +, icu +, libunwind +, curl +, zlib +, libuuid +, dotnetbuildhelpers +, dotnetCorePackages +, coreclr +, openssl +}: + +stdenv.mkDerivation rec { + pname = "azure-functions-core-tools"; + version = "3.0.3568"; + + src = fetchurl { + url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip"; + sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg"; + }; + + buildInputs = [ + unzip + makeWrapper + dotnetbuildhelpers + ]; + + nativeBuildInputs = [ + icu + libunwind + curl + zlib + dotnetCorePackages.sdk_3_1 + ]; + + libPath = lib.makeLibraryPath [ + libunwind + libuuid + stdenv.cc.cc + curl + zlib + icu + openssl + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + mkdir -p $out/bin + cp -prd * $out/bin + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" "$out/bin/func" + chmod +x $out/bin/func $out/bin/gozip + find $out/bin -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \; + wrapProgram "$out/bin/func" --prefix LD_LIBRARY_PATH : ${libPath} + ''; + dontStrip = true; # Causes rpath patching to break if not set + + meta = with lib; { + homepage = "https://github.com/Azure/azure-functions-core-tools"; + description = "Command line tools for Azure Functions"; + license = licenses.mit; + maintainers = with maintainers; [ jshcmpbll ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5bfe83def08..22636b588b7 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-APHRNCJNQ4cheY+wBB8q4fcOOL6SFeg5SflvnrxjYhI="; + sha256 = "sha256-G2cHKhgsv1fj7eKbADER3R2uXp9DnKevboE7vnO5pDE="; }; - vendorSha256 = "sha256-+B+5GQTEiCwLCoGB5uIIJEWJRjylgt9txcsJCXcOAQs="; + vendorSha256 = "sha256-5qpeAD4VFsR8iJlRiNTncOdq39lq3MU6gSLu3G/BcPU="; doCheck = false; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index c1060744f44..fc87f5b781a 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -7,18 +7,19 @@ buildGoModule rec { pname = "buf"; - version = "0.43.2"; + version = "0.44.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + sha256 = "sha256-ZcZvsFw/l/7N8Yb4HG6w96ce9c4g4iiG/TcDoj8RYmA="; leaveDotGit = true; # Required by TestWorkspaceGit }; - vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; + vendorSha256 = "sha256-g0wrHPeHFOL6KB0SUgBy2WK54Kttiks4cuYg8jf3N9g="; patches = [ + # Skip a test that requires networking to be available to work. ./skip_test_requiring_network.patch ]; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 9be3d232fb8..3b775eeaef1 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -39,6 +39,14 @@ let HOME=. escript bootstrap ''; + + patches = [] + # Skips test that can write outside the designated tmp directory, potentially resulting in build failures + # due to file ownership issues if ran without sandbox (eg. Mac M1 default). This patch can be Removed when + # rebar3 releases with the following commit: + # https://github.com/erlang/rebar3/commit/11055384dbd5bf7d181bca83a33b0e100275ff21 + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ./tmp-tests-skip.patch ]; + checkPhase = '' HOME=. escript ./rebar3 ct ''; diff --git a/pkgs/development/tools/build-managers/rebar3/tmp-tests-skip.patch b/pkgs/development/tools/build-managers/rebar3/tmp-tests-skip.patch new file mode 100644 index 00000000000..b90e0f9d2bb --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/tmp-tests-skip.patch @@ -0,0 +1,17 @@ +diff --git a/test/rebar_file_utils_SUITE.erl b/test/rebar_file_utils_SUITE.erl +index d771a82..05cfbf7 100644 +--- a/test/rebar_file_utils_SUITE.erl ++++ b/test/rebar_file_utils_SUITE.erl +@@ -34,13 +34,11 @@ + + all() -> + [{group, tmpdir}, +- {group, reset_dir}, + {group, mv}, + path_from_ancestor, + canonical_path, + absolute_path, + normalized_path, +- resolve_link, + split_dirname, + mv_warning_is_ignored]. diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index c6d1e47389a..46ee41d37df 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.0.0"; + version = "2.0.3"; - vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; + vendorSha256 = "sha256-3qTH/p0l6Ke1F9SUcvK2diqZooOMnlXYO1PHLdJJ8PM="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; + sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI="; }; preBuild = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4bf0ab7b567..2dc5c4e77c8 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 = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-iqWQAZV1H3p9Ud+6U2RwIpfFlsu+7SE96Abh3u8CCVs="; + sha256 = "sha256-2Y/eRIkskuk+7GC/br178XzWTnP4iXSFfa5ybLjvqDA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 9ebc04ca63a..aa7c7c8ca05 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.61.0"; + version = "1.62.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg="; + sha256 = "sha256-5YqGNuC1mmsIsEtnbgumaLuZGy3k6L9jZNbVwZln8WY="; }; meta = with lib; { diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 7441d4018a8..708cdb511a8 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "gnulib"; - version = "20200223"; + version = "20210702"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; - rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; - sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; + rev = "901694b904cd861adc2529b2e05a3fb33f9b534f"; + sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w"; }; postPatch = '' diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 280e0c1e986..d9b32c2c524 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-oXr98guqEvE/rpRJF5NMjQYZtzbrh1F/neXYbLaCGUg="; + sha256 = "sha256-3DTjxcMxgaTMunctHaCgOX5/P85lJDRin6RpMuv9Rfg="; }; vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 8783d217c1f..b99e8a73457 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,28 +1,26 @@ -{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub }: +{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure }: stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.06.01-16.19.44"; + version = "2021.07.12-12.30.59"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao="; + sha256 = "0iky3yh548xn28285x8gnjzc00f3i2b415wb2dhd9p9y2bgzhkld"; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q="; + sha256 = "02k1k0slh1lm7k43d52jvgl0fdyp9gcr8csbr6yi71qbhy0axrmp"; }; GRAALVM_HOME = graalvm11-ce; CLOJURE_LSP_JAR = jar; CLOJURE_LSP_XMX = "-J-Xmx4g"; - patches = lib.optionals stdenv.isDarwin [ ./disable-check-toolchain.patch ]; - - buildInputs = [ graalvm11-ce ]; + buildInputs = [ graalvm11-ce clojure ]; buildPhase = with lib; '' runHook preBuild diff --git a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch b/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch deleted file mode 100644 index 402189627c2..00000000000 --- a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/graalvm/native-unix-compile.sh b/graalvm/native-unix-compile.sh -index ec0e49f..e19a120 100755 ---- a/graalvm/native-unix-compile.sh -+++ b/graalvm/native-unix-compile.sh -@@ -17,6 +17,7 @@ CLOJURE_LSP_XMX=${CLOJURE_LSP_XMX:-"-J-Xmx4g"} - - args=("-jar" "$CLOJURE_LSP_JAR" - "-H:+ReportExceptionStackTraces" -+ "-H:-CheckToolchain" - "--verbose" - "--no-fallback" - "--native-image-info" diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index fccee0ede2b..24e2e0fea6b 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc"; + sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp"; }; - vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5"; + vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr"; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; homepage = "https://github.com/reviewdog/reviewdog"; - changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; + changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md"; maintainers = [ maintainers.marsam ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh new file mode 100755 index 00000000000..402d64c9b61 --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p msbuild -p jq -p xmlstarlet -p curl +set -euo pipefail + +cat << EOL +{ fetchurl }: [ +EOL + +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT + +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done + ) + +msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ + -p:RestoreNoCache=true -p:RestoreForce=true \ + src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 + +cd "$tmpdir" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done + + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi + + sha256=$(nix-prefetch-url "$url" 2>/dev/null) + cat << EOL + { + name = "$package"; + version = "$version"; + src = fetchurl { + url = "$url"; + sha256 = "$sha256"; + }; + } +EOL + done + cd .. +done +cd .. + +cat << EOL +] +EOL diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index e0710079b62..7cf36fd1f89 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,42 +1,104 @@ { lib, stdenv +, fetchFromGitHub , fetchurl -, mono +, mono6 , msbuild , dotnet-sdk , makeWrapper -, dotnetPackages +, unzip +, writeText }: -stdenv.mkDerivation rec { +let + + deps = map (package: stdenv.mkDerivation (with package; { + pname = name; + inherit version src; + + buildInputs = [ unzip ]; + unpackPhase = '' + unzip $src + chmod -R u+r . + function traverseRename () { + for e in * + do + t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")" + [ "$t" != "$e" ] && mv -vn "$e" "$t" + if [ -d "$t" ] + then + cd "$t" + traverseRename + cd .. + fi + done + } + + traverseRename + ''; + + installPhase = '' + runHook preInstall + + package=$out/lib/dotnet/${name}/${version} + mkdir -p $package + cp -r . $package + echo "{}" > $package/.nupkg.metadata + + runHook postInstall + ''; + + dontFixup = true; + })) + (import ./deps.nix { inherit fetchurl; }); + + nuget-config = writeText "NuGet.Config" '' + <?xml version="1.0" encoding="utf-8"?> + <configuration> + <packageSources> + <clear /> + </packageSources> + <fallbackPackageFolders> + ${lib.concatStringsSep "\n" (map (package: "<add key=\"${package}\" value=\"${package}/lib/dotnet\"/>") deps)} + </fallbackPackageFolders> + </configuration> + ''; + +in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.8"; + version = "1.37.12"; - src = fetchurl { - url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0kgv4l15rli9a7grmcsbv72csmxi7vqa7lrrr8bd4cq9ighh54q3"; + src = fetchFromGitHub { + owner = "OmniSharp"; + repo = pname; + rev = "v${version}"; + sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw"; }; - nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ]; + nativeBuildInputs = [ makeWrapper msbuild ]; - preUnpack = '' - mkdir src - cd src - sourceRoot=. + buildPhase = '' + runHook preBuild + + HOME=$(pwd)/fake-home msbuild -r -p:Configuration=Release -p:RestoreConfigFile=${nuget-config} src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj + + runHook postBuild ''; installPhase = '' mkdir -p $out/bin - cd .. - cp -r src $out/ - rm -r $out/src/.msbuild - cp -r ${msbuild}/lib/mono/msbuild $out/src/.msbuild - - chmod -R u+w $out/src - mv $out/src/.msbuild/Current/{bin,Bin} + cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src + cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src + mkdir $out/src/.msbuild + ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/ + rm $out/src/.msbuild/Current + mkdir $out/src/.msbuild/Current + ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/ + ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin - makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ - --add-flags "$out/src/OmniSharp.exe" + makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ + --prefix PATH : ${dotnet-sdk}/bin \ + --add-flags "$out/src/OmniSharp.exe" ''; meta = with lib; { @@ -44,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ tesq0 ericdallo ]; + maintainers = with maintainers; [ tesq0 ericdallo corngood ]; }; } diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix new file mode 100644 index 00000000000..b64d5894da8 --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -0,0 +1,2210 @@ +{ fetchurl }: [ + { + name = "cake.scripting.abstractions"; + version = "0.6.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; + sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l"; + }; + } + { + name = "cake.scripting.transport"; + version = "0.6.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; + sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n"; + }; + } + { + name = "dotnet.script.dependencymodel"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg"; + sha256 = "0ly1jwvzndrhgvrwy7kagabyca40j8w9p5jvvfj4wlpffvxq44xl"; + }; + } + { + name = "dotnet.script.dependencymodel.nuget"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg"; + sha256 = "1kvjrm28jlfmcsy5fna8hy814chbcsc39ka12h8mgpdvjkr93njr"; + }; + } + { + name = "humanizer.core"; + version = "2.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg"; + sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; + }; + } + { + name = "icsharpcode.decompiler"; + version = "7.1.0.6543"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg"; + sha256 = "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46"; + }; + } + { + name = "mcmaster.extensions.commandlineutils"; + version = "2.2.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/2.2.4/mcmaster.extensions.commandlineutils.2.2.4.nupkg"; + sha256 = "0hy45iacm9zlrj6p2j2i2gkbs4k52mncnlnjvwgh6b6523p9msfy"; + }; + } + { + name = "mediatr"; + version = "8.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg"; + sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; + }; + } + { + name = "messagepack"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; + sha256 = "1ks1w6pn96zm8nhz3ff6qdrmf0abppglwaa6vw83kj3d2qw74sw1"; + }; + } + { + name = "messagepackanalyzer"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; + sha256 = "18iacmw5v3dp8lma9c0rh5jh8g1hkxnkq78kx7n00wkwxa58badx"; + }; + } + { + name = "messagepack.annotations"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; + sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "1.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }; + } + { + name = "microsoft.build"; + version = "16.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; + sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46"; + }; + } + { + name = "microsoft.build.framework"; + version = "16.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; + sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja"; + }; + } + { + name = "microsoft.build.locator"; + version = "1.4.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg"; + sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; + }; + } + { + name = "microsoft.build.tasks.core"; + version = "16.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; + sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg"; + }; + } + { + name = "microsoft.build.tasks.git"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.0.0/microsoft.build.tasks.git.1.0.0.nupkg"; + sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; + }; + } + { + name = "microsoft.build.utilities.core"; + version = "16.10.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; + sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14"; + }; + } + { + name = "microsoft.codeanalysis.analyzers"; + version = "3.3.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg"; + sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; + }; + } + { + name = "microsoft.codeanalysis.analyzerutilities"; + version = "3.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; + sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; + }; + } + { + name = "microsoft.codeanalysis.common"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-2.21322.50/microsoft.codeanalysis.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1j9yl7m0lr03fjklzjyiac1lrgs8541frqmi4xlldn8a2sx3h97x"; + }; + } + { + name = "microsoft.codeanalysis.csharp"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.4.0.0-2.21322.50.nupkg"; + sha256 = "1mmcl4rj3n1q7zh1n9b9ph3lvm8i51sdm87q3sgiczv2pxrihzs6"; + }; + } + { + name = "microsoft.codeanalysis.csharp.features"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.features.4.0.0-2.21322.50.nupkg"; + sha256 = "11pzbswlznz71m248c1p4fi4i3zzvpc4a71px9j2lhnm57zy2lvy"; + }; + } + { + name = "microsoft.codeanalysis.csharp.scripting"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.scripting.4.0.0-2.21322.50.nupkg"; + sha256 = "0piiyg1l27cy6s4ii80phrdsyhl8zvwbj9aljqkg53gki520x19p"; + }; + } + { + name = "microsoft.codeanalysis.csharp.workspaces"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.workspaces.4.0.0-2.21322.50.nupkg"; + sha256 = "0q6jkgjh1dylmjx8a79ighgbai1jr2fhls9m7khi87anzc3wdcl2"; + }; + } + { + name = "microsoft.codeanalysis.externalaccess.omnisharp"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-2.21322.50.nupkg"; + sha256 = "1rv5qsj8lsfqxdzd6zazrzwzaxwmj6szd9hv2ckbb4lypkn8ifs8"; + }; + } + { + name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-2.21322.50.nupkg"; + sha256 = "0ygp7hnm6mn9khh6z573avhvbcx5459fmyz4z657dx9p2v1f0fs0"; + }; + } + { + name = "microsoft.codeanalysis.features"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-2.21322.50/microsoft.codeanalysis.features.4.0.0-2.21322.50.nupkg"; + sha256 = "1grkql2wcqsqlmqnfchw6wxynwpz4x9wgqd00zpc1g04z9lqimq6"; + }; + } + { + name = "microsoft.codeanalysis.scripting.common"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-2.21322.50/microsoft.codeanalysis.scripting.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1c14bg99ywxdvlp5zc08ijc030rxmpb3171kz2z6f5kr02vf296x"; + }; + } + { + name = "microsoft.codeanalysis.workspaces.common"; + version = "4.0.0-2.21322.50"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-2.21322.50/microsoft.codeanalysis.workspaces.common.4.0.0-2.21322.50.nupkg"; + sha256 = "1c0m5pg156x8zh50x7rp25p8cn09gbv50wpbz2p1nc5ff5dyavf5"; + }; + } + { + name = "microsoft.csharp"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }; + } + { + name = "microsoft.diasymreader"; + version = "1.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.3.0/microsoft.diasymreader.1.3.0.nupkg"; + sha256 = "1nswah83z3pfibaqmjd8y96fgnkrak8005qqinc8nqs5mpkf5pfb"; + }; + } + { + name = "microsoft.dotnet.platformabstractions"; + version = "3.1.6"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; + }; + } + { + name = "microsoft.extensions.caching.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; + sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + }; + } + { + name = "microsoft.extensions.caching.memory"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; + sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + }; + } + { + name = "microsoft.extensions.configuration"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }; + } + { + name = "microsoft.extensions.configuration"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; + sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; + }; + } + { + name = "microsoft.extensions.configuration.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }; + } + { + name = "microsoft.extensions.configuration.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; + sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + }; + } + { + name = "microsoft.extensions.configuration.binder"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }; + } + { + name = "microsoft.extensions.configuration.binder"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; + sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; + }; + } + { + name = "microsoft.extensions.configuration.commandline"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; + sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; + }; + } + { + name = "microsoft.extensions.configuration.environmentvariables"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; + sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; + }; + } + { + name = "microsoft.extensions.configuration.fileextensions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; + sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; + }; + } + { + name = "microsoft.extensions.configuration.json"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; + sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; + }; + } + { + name = "microsoft.extensions.dependencyinjection"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg"; + sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; + }; + } + { + name = "microsoft.extensions.dependencyinjection"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; + sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; + }; + } + { + name = "microsoft.extensions.dependencyinjection.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }; + } + { + name = "microsoft.extensions.dependencyinjection.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; + }; + } + { + name = "microsoft.extensions.dependencymodel"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + }; + } + { + name = "microsoft.extensions.fileproviders.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; + sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; + }; + } + { + name = "microsoft.extensions.fileproviders.physical"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; + sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; + }; + } + { + name = "microsoft.extensions.filesystemglobbing"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; + sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; + }; + } + { + name = "microsoft.extensions.logging"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg"; + sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; + }; + } + { + name = "microsoft.extensions.logging"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg"; + sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "2.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg"; + sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; + }; + } + { + name = "microsoft.extensions.logging.configuration"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; + sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa"; + }; + } + { + name = "microsoft.extensions.logging.console"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; + sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz"; + }; + } + { + name = "microsoft.extensions.options"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }; + } + { + name = "microsoft.extensions.options"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; + }; + } + { + name = "microsoft.extensions.options.configurationextensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }; + } + { + name = "microsoft.extensions.options.configurationextensions"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; + sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw"; + }; + } + { + name = "microsoft.extensions.primitives"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }; + } + { + name = "microsoft.extensions.primitives"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; + }; + } + { + name = "microsoft.netcore.app"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app/2.1.0/microsoft.netcore.app.2.1.0.nupkg"; + sha256 = "1qgw6njwz30l5cwkvgf2fbsjqkc9vy0w3939c24iabmvjnzjr6a4"; + }; + } + { + name = "microsoft.netcore.dotnetapphost"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnetapphost/2.1.0/microsoft.netcore.dotnetapphost.2.1.0.nupkg"; + sha256 = "10hnhkix2av0c7djp2q88pw407m8gk3im4r06x762a3cs6f2jprd"; + }; + } + { + name = "microsoft.netcore.dotnethostpolicy"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostpolicy/2.1.0/microsoft.netcore.dotnethostpolicy.2.1.0.nupkg"; + sha256 = "1xh8ij7zyfkrk20rgpwqs00mxdy2qiwr7qar2xk397zk2bh2d90n"; + }; + } + { + name = "microsoft.netcore.dotnethostresolver"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostresolver/2.1.0/microsoft.netcore.dotnethostresolver.2.1.0.nupkg"; + sha256 = "1384k3cg4sjcn3hyalcm43fhmlfj5pnywpzd9zpgc4jsr2c16x76"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; + sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.1.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "3.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/2.1.0/microsoft.netcore.targets.2.1.0.nupkg"; + sha256 = "1dav8x5551nwdqfigxf9zfsml5l9lakg86x38s9dvps81xs5d9zq"; + }; + } + { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; + sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; + }; + } + { + name = "microsoft.netframework.referenceassemblies.net472"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; + sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; + }; + } + { + name = "microsoft.net.stringtools"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg"; + sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; + }; + } + { + name = "microsoft.sourcelink.common"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.0.0/microsoft.sourcelink.common.1.0.0.nupkg"; + sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; + }; + } + { + name = "microsoft.sourcelink.github"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.0.0/microsoft.sourcelink.github.1.0.0.nupkg"; + sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; + }; + } + { + name = "microsoft.testplatform.objectmodel"; + version = "16.9.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; + sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; + }; + } + { + name = "microsoft.testplatform.translationlayer"; + version = "16.9.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; + sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0"; + }; + } + { + name = "microsoft.visualstudio.debugger.contracts"; + version = "17.2.0-beta.21262.1"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg"; + sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9"; + }; + } + { + name = "microsoft.visualstudio.sdk.embedinteroptypes"; + version = "15.0.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.12/microsoft.visualstudio.sdk.embedinteroptypes.15.0.12.nupkg"; + sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; + }; + } + { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.14.114"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.14.114/microsoft.visualstudio.setup.configuration.interop.1.14.114.nupkg"; + sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; + }; + } + { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.16.30"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; + sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; + }; + } + { + name = "microsoft.visualstudio.threading"; + version = "16.7.56"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg"; + sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; + }; + } + { + name = "microsoft.visualstudio.threading.analyzers"; + version = "16.7.56"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg"; + sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; + }; + } + { + name = "microsoft.visualstudio.validation"; + version = "15.5.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg"; + sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; + }; + } + { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }; + } + { + name = "microsoft.win32.registry"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }; + } + { + name = "microsoft.win32.registry"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg"; + sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; + }; + } + { + name = "nerdbank.streams"; + version = "2.6.81"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg"; + sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; + }; + } + { + name = "netstandard.library"; + version = "1.6.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }; + } + { + name = "netstandard.library"; + version = "2.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }; + } + { + name = "newtonsoft.json"; + version = "11.0.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }; + } + { + name = "newtonsoft.json"; + version = "12.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }; + } + { + name = "newtonsoft.json"; + version = "9.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }; + } + { + name = "nuget.common"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.2.0/nuget.common.5.2.0.nupkg"; + sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; + }; + } + { + name = "nuget.configuration"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.2.0/nuget.configuration.5.2.0.nupkg"; + sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; + }; + } + { + name = "nuget.dependencyresolver.core"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.2.0/nuget.dependencyresolver.core.5.2.0.nupkg"; + sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; + }; + } + { + name = "nuget.frameworks"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }; + } + { + name = "nuget.frameworks"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.2.0/nuget.frameworks.5.2.0.nupkg"; + sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; + }; + } + { + name = "nuget.librarymodel"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.2.0/nuget.librarymodel.5.2.0.nupkg"; + sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; + }; + } + { + name = "nuget.packaging"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.2.0/nuget.packaging.5.2.0.nupkg"; + sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; + }; + } + { + name = "nuget.packaging.core"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.2.0/nuget.packaging.core.5.2.0.nupkg"; + sha256 = "16sm2amzvbpmisb6x6dz1pvj1h3xm67vd2byl1wl13vrda0az3xb"; + }; + } + { + name = "nuget.projectmodel"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.2.0/nuget.projectmodel.5.2.0.nupkg"; + sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; + }; + } + { + name = "nuget.protocol"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.2.0/nuget.protocol.5.2.0.nupkg"; + sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; + }; + } + { + name = "nuget.versioning"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.2.0/nuget.versioning.5.2.0.nupkg"; + sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; + }; + } + { + name = "omnisharp.extensions.jsonrpc"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.0/omnisharp.extensions.jsonrpc.0.19.0.nupkg"; + sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; + }; + } + { + name = "omnisharp.extensions.jsonrpc.generators"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.0/omnisharp.extensions.jsonrpc.generators.0.19.0.nupkg"; + sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; + }; + } + { + name = "omnisharp.extensions.languageprotocol"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.0/omnisharp.extensions.languageprotocol.0.19.0.nupkg"; + sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; + }; + } + { + name = "omnisharp.extensions.languageserver"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.0/omnisharp.extensions.languageserver.0.19.0.nupkg"; + sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; + }; + } + { + name = "omnisharp.extensions.languageserver.shared"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.0/omnisharp.extensions.languageserver.shared.0.19.0.nupkg"; + sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; + }; + } + { + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }; + } + { + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }; + } + { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }; + } + { + name = "runtime.native.system"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }; + } + { + name = "runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }; + } + { + name = "runtime.native.system.net.http"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }; + } + { + name = "runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }; + } + { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }; + } + { + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }; + } + { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }; + } + { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }; + } + { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }; + } + { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }; + } + { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }; + } + { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }; + } + { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }; + } + { + name = "sqlitepclraw.bundle_green"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg"; + sha256 = "1197ynpm4fl6il9vi0mi1s1pmw3rk3j0a05kwrxpqlfgp7iwhc22"; + }; + } + { + name = "sqlitepclraw.core"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg"; + sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; + }; + } + { + name = "sqlitepclraw.lib.e_sqlite3"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg"; + sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; + }; + } + { + name = "sqlitepclraw.provider.dynamic_cdecl"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg"; + sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; + }; + } + { + name = "sqlitepclraw.provider.e_sqlite3"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg"; + sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7"; + }; + } + { + name = "system.appcontext"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }; + } + { + name = "system.buffers"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }; + } + { + name = "system.buffers"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }; + } + { + name = "system.buffers"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }; + } + { + name = "system.buffers"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; + }; + } + { + name = "system.codedom"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; + sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; + }; + } + { + name = "system.collections"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }; + } + { + name = "system.collections"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }; + } + { + name = "system.collections.concurrent"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }; + } + { + name = "system.collections.immutable"; + version = "1.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }; + } + { + name = "system.collections.immutable"; + version = "1.7.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }; + } + { + name = "system.collections.immutable"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }; + } + { + name = "system.componentmodel.composition"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.composition/4.5.0/system.componentmodel.composition.4.5.0.nupkg"; + sha256 = "196ihd17in5idnxq5l5xvpa1fhqamnihjg3mcmv1k4n8bjrrj5y7"; + }; + } + { + name = "system.composition"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg"; + sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; + }; + } + { + name = "system.composition.attributedmodel"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg"; + sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; + }; + } + { + name = "system.composition.convention"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg"; + sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; + }; + } + { + name = "system.composition.hosting"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg"; + sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; + }; + } + { + name = "system.composition.runtime"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg"; + sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; + }; + } + { + name = "system.composition.typedparts"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg"; + sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; + }; + } + { + name = "system.configuration.configurationmanager"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; + sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; + }; + } + { + name = "system.console"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }; + } + { + name = "system.diagnostics.debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }; + } + { + name = "system.diagnostics.diagnosticsource"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }; + } + { + name = "system.diagnostics.diagnosticsource"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }; + } + { + name = "system.diagnostics.process"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }; + } + { + name = "system.diagnostics.tools"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }; + } + { + name = "system.diagnostics.tracing"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }; + } + { + name = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }; + } + { + name = "system.globalization"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }; + } + { + name = "system.globalization"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }; + } + { + name = "system.globalization.calendars"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }; + } + { + name = "system.globalization.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }; + } + { + name = "system.io"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }; + } + { + name = "system.io"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }; + } + { + name = "system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }; + } + { + name = "system.io.compression.zipfile"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }; + } + { + name = "system.io.filesystem"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }; + } + { + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }; + } + { + name = "system.io.pipelines"; + version = "4.7.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg"; + sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; + }; + } + { + name = "system.io.pipelines"; + version = "5.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; + }; + } + { + name = "system.linq"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }; + } + { + name = "system.linq.expressions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }; + } + { + name = "system.memory"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }; + } + { + name = "system.memory"; + version = "4.5.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }; + } + { + name = "system.net.http"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }; + } + { + name = "system.net.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }; + } + { + name = "system.net.sockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }; + } + { + name = "system.net.websockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }; + } + { + name = "system.numerics.vectors"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }; + } + { + name = "system.numerics.vectors"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }; + } + { + name = "system.objectmodel"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }; + } + { + name = "system.reactive"; + version = "4.4.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg"; + sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; + }; + } + { + name = "system.reflection"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }; + } + { + name = "system.reflection"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }; + } + { + name = "system.reflection.dispatchproxy"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.5.1/system.reflection.dispatchproxy.4.5.1.nupkg"; + sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; + }; + } + { + name = "system.reflection.emit"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }; + } + { + name = "system.reflection.emit"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }; + } + { + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }; + } + { + name = "system.reflection.emit.ilgeneration"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; + sha256 = "0jxc26k5q0rwrldi30bfbrfw4jh3kvribzwc8ryzr24kmhr3vv96"; + }; + } + { + name = "system.reflection.emit.lightweight"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }; + } + { + name = "system.reflection.emit.lightweight"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + }; + } + { + name = "system.reflection.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }; + } + { + name = "system.reflection.metadata"; + version = "1.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }; + } + { + name = "system.reflection.metadata"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; + }; + } + { + name = "system.reflection.primitives"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }; + } + { + name = "system.reflection.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }; + } + { + name = "system.reflection.typeextensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }; + } + { + name = "system.resources.extensions"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; + sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; + }; + } + { + name = "system.resources.resourcemanager"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }; + } + { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }; + } + { + name = "system.runtime"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }; + } + { + name = "system.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.7.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; + sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }; + } + { + name = "system.runtime.extensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }; + } + { + name = "system.runtime.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }; + } + { + name = "system.runtime.handles"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }; + } + { + name = "system.runtime.handles"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }; + } + { + name = "system.runtime.interopservices"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }; + } + { + name = "system.runtime.interopservices"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }; + } + { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }; + } + { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }; + } + { + name = "system.runtime.interopservices.windowsruntime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.windowsruntime/4.3.0/system.runtime.interopservices.windowsruntime.4.3.0.nupkg"; + sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; + }; + } + { + name = "system.runtime.numerics"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg"; + sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }; + } + { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }; + } + { + name = "system.security.cryptography.algorithms"; + version = "4.3.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg"; + sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2"; + }; + } + { + name = "system.security.cryptography.cng"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }; + } + { + name = "system.security.cryptography.cng"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg"; + sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; + }; + } + { + name = "system.security.cryptography.csp"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }; + } + { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }; + } + { + name = "system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }; + } + { + name = "system.security.cryptography.pkcs"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg"; + sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm"; + }; + } + { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }; + } + { + name = "system.security.cryptography.protecteddata"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; + sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + }; + } + { + name = "system.security.cryptography.protecteddata"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg"; + sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; + }; + } + { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }; + } + { + name = "system.security.cryptography.xml"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg"; + sha256 = "08c82yb1nhfqr15rrypc36c7pysp7jymkwnra84w72nd53h3dfgb"; + }; + } + { + name = "system.security.permissions"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.5.0/system.security.permissions.4.5.0.nupkg"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }; + } + { + name = "system.security.permissions"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; + sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg"; + sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }; + } + { + name = "system.text.encoding"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }; + } + { + name = "system.text.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }; + } + { + name = "system.text.encoding.codepages"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }; + } + { + name = "system.text.encoding.codepages"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }; + } + { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }; + } + { + name = "system.text.encodings.web"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; + sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; + }; + } + { + name = "system.text.encodings.web"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + }; + } + { + name = "system.text.json"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; + sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + }; + } + { + name = "system.text.json"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + }; + } + { + name = "system.text.regularexpressions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }; + } + { + name = "system.threading"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }; + } + { + name = "system.threading"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }; + } + { + name = "system.threading.tasks"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }; + } + { + name = "system.threading.tasks"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }; + } + { + name = "system.threading.tasks.dataflow"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg"; + sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; + sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }; + } + { + name = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }; + } + { + name = "system.threading.threadpool"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }; + } + { + name = "system.threading.timer"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }; + } + { + name = "system.valuetuple"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.4.0/system.valuetuple.4.4.0.nupkg"; + sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; + }; + } + { + name = "system.valuetuple"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }; + } + { + name = "system.xml.readerwriter"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }; + } + { + name = "system.xml.xdocument"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }; + } +] diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 6737f161754..17dc0900fdb 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4="; + sha256 = "sha256-pyqG8k2jHUhYZ1ftfAjxpJ4H1P1uWfqSdGcyR7pw1rE="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 4f65d5fa5db..7c286218d8e 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -8,6 +8,14 @@ in configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + patches = (drv.patches or []) ++ [ + # Support citerefentry DocBook element. + # https://github.com/jgm/pandoc/pull/7437 + (fetchpatch { + url = "https://github.com/jgm/pandoc/commit/06408d08e5ccf06a6a04c9b77470e6a67d98e52c.patch"; + sha256 = "gOtrWVylzwgu0YLD4SztqlXxtaXXGOf8nTqLwUBS7qs="; + }) + ]; })).overrideAttrs (drv: { # These libraries are still referenced, because they generate diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index e5eb3029c86..2671e4148b1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -16,6 +16,7 @@ tree-sitter-jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json)); tree-sitter-json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json)); tree-sitter-julia = (builtins.fromJSON (builtins.readFile ./tree-sitter-julia.json)); + tree-sitter-latex = (builtins.fromJSON (builtins.readFile ./tree-sitter-latex.json)); tree-sitter-lua = (builtins.fromJSON (builtins.readFile ./tree-sitter-lua.json)); tree-sitter-markdown = (builtins.fromJSON (builtins.readFile ./tree-sitter-markdown.json)); tree-sitter-nix = (builtins.fromJSON (builtins.readFile ./tree-sitter-nix.json)); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json new file mode 100644 index 00000000000..fdc910c4fd5 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/latex-lsp/tree-sitter-latex", + "rev": "7f720661de5316c0f8fee956526d4002fa1086d8", + "date": "2021-05-11T16:35:53+02:00", + "path": "/nix/store/ssqxahrza89qmb97bxas6dvhbqd7w0dr-tree-sitter-latex", + "sha256": "14jfmbv3czs643bggcsi3pyxhf81jirpvg8hxcbcdx1f3fzhs16m", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index ad064c556ad..55237b298d2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -74,6 +74,10 @@ let orga = "cstrahan"; repo = "tree-sitter-nix"; }; + "tree-sitter-latex" = { + orga = "latex-lsp"; + repo = "tree-sitter-latex"; + }; "tree-sitter-lua" = { orga = "nvim-treesitter"; repo = "tree-sitter-lua"; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 701c22471ee..14518939dcd 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.51.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE="; + sha256 = "sha256-9XVvdAt/TWQdCY8s//QHZC6THFAf+pMYQpjHjUR3wrc="; }; - vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA="; + vendorSha256 = "sha256-m6eQ843aP68TO4W5Nq4zKqcf2wgdH/7Srzt37t/NSdk="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 7d222e03bc9..68669e88516 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: +{ stdenv, lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "rq"; @@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj"; - buildInputs = [ llvmPackages.libclang v8 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; - postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. # Prevents build failures when upgrading rustc, which may give more warnings. @@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec { --replace "#![deny(warnings)]" "" ''; - configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" - export V8_SOURCE="${v8}" - ''; - meta = with lib; { description = "A tool for doing record analysis and transformation"; homepage = "https://github.com/dflemstr/rq"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index d5fd7ee4a83..01173474db6 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.34.0"; + version = "0.35.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/9v9nedLoXwuFuqw3W4RjTwvNIlisbiPCcVF/0oH4fw="; + sha256 = "sha256-pC3iX5jAPBArxs+YECDyUW5+MP+/f2HMLZNjo+BoKOE="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-clav4lGDuWvwzq78Kw+vtz+boNcZnNH+NHH7ZaZYSC4="; + cargoSha256 = "sha256-Zp2LoeCnpYupi/QY3Ft1VQ+O/y3I96UaouEFs9QpbLg="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a6381576ead..7daeaac14b1 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-07-05"; - cargoSha256 = "sha256-HmvvDHi33JAYXON98mbb+MfmJizOL4cdTbc3QDtPkZo="; + version = "2021-07-12"; + cargoSha256 = "sha256-wlo3GlB9OhyVXys5pHAqWPKHWZHzNjcQ0hiaYnp2SUc="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-7pH38U+HMNPuO1BFP5kPTJoxGWTewRUoLrc9NXDdK2M="; + sha256 = "sha256-nd8valnltycywxBObSVFbt4fySEYQknFsFf5ZnEbgOk="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 7394b402cfe..86ab951bb9d 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "1xpl3nxiln6hxxjd9nx99h4qijjym3afxm5nalw40p152h8zgig4"; + sha256 = "03w976fghqs2kswab5bridpr2p6hgldjyfd3l4kz0p5h98f3wzvf"; }; - cargoSha256 = "012zv1myackwk0x73l6ri7zzrzwdkd970hh4p30b590bmsam6sb9"; + cargoSha256 = "1311ly02r6c2rqx0ssd6hpbw3sp0ffrf37bzdm66chxnh8cr83sj"; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 19cd15e7be4..27453ed5988 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -5,7 +5,7 @@ let in appimageTools.wrapType2 rec { name = "unityhub"; - extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr + extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr alsa-lib cups gnome2.GConf libcap fontconfig freetype pango cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 82f0018ce69..d4e665adc41 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { pname = "vndr-unstable"; - version = "2018-06-23"; - rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; + version = "2020-07-28"; + rev = "f12b881cb8f081a5058408a58f429b9014833fc6"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,13 +12,13 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "0c0k0cic35d1141az72gbf8r0vm9zaq4xi8v1sqpxhlzf28m297l"; + sha256 = "04za4x8p8qzwjlp4i0j0gsb4xx0x9f4yp3ab0b97r50pah1ac2g3"; }; meta = { description = "Stupid golang vendoring tool, inspired by docker vendor script"; homepage = "https://github.com/LK4D4/vndr"; - maintainers = with lib.maintainers; [ vdemeester ]; + maintainers = with lib.maintainers; [ vdemeester rvolosatovs ]; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/README.md b/pkgs/development/web/cypress/cypress-example-kitchensink/README.md new file mode 100644 index 00000000000..d5a6460ed9f --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/README.md @@ -0,0 +1,24 @@ + +# `cypress-example-kitchensink` + +This directory 'packages' [cypress-example-kitchensink](https://github.com/cypress-io/cypress-example-kitchensink), +which is used in `cypress.passthru.tests`. + +The app is not really intended for deployment, so I didn't bother with actual packaging, just testing. +If your real-world app looks like `cypress-example-kitchensink`, you'll want to use Nix multiple outputs so you don't deploy your test videos along with your app. +Alternatively, you can set it up so that one derivation builds your server exe and another derivation takes that server exe and runs it with the cypress e2e tests. + +## Peculiarities + +**cypress and Cypress** are distinct names. + - `cypress` is the npm module, containing the executable `cypress` + - whereas the executable `Cypress` comes from `pkgs.cypress`, a binary distribution (as of writing) by cypress.io. + +**updateScript** is not provided for this example project. This seems preferable, + because updates to it aren't particularly valuable and have a significant overhead. + The goal is to smoke test `cypress`; not run the latest test suite (which it isn't anyway). + +## Updating + + - update the hash in `src.nix` + - run `regen-nix` diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix new file mode 100644 index 00000000000..653dbe4a257 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit callPackage; + inherit nodeEnv; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix new file mode 100644 index 00000000000..86fec895000 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix @@ -0,0 +1,59 @@ +{ callPackage +, cypress +, nodejs-12_x +, # FIXME: duplicated from ./regen-nix. node2nix should expose this + nodePackages +, xorg +, pkgs +, stdenv +, +}: + +let + fromNode2nix = import ./cypress-example-kitchensink.nix { + inherit pkgs; + }; + + nodeDependencies = fromNode2nix.shell.nodeDependencies.overrideAttrs (o: { + CYPRESS_INSTALL_BINARY = "0"; + PUPPETEER_SKIP_DOWNLOAD = "1"; + }); + + fontConfigEtc = ( + pkgs.nixos { config.fonts.fontconfig.enable = true; } + ).config.environment.etc.fonts.source; + +in +stdenv.mkDerivation { + name = "cypress-example-kitchensink"; + src = callPackage ./src.nix { }; + passthru.fc = fontConfigEtc; + nativeBuildInputs = [ + cypress + nodejs-12_x + xorg.xorgserver + nodePackages.jsonplaceholder + ]; + FONTCONFIG_PATH = fontConfigEtc; + postPatch = '' + # Use our own offline backend. 15011 means js0n ;) + sed -e 's^https://jsonplaceholder.cypress.io^http://localhost:15011^g' -i $(find . -type f) + ''; + buildPhase = '' + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + PATH="${nodeDependencies}/bin:$PATH" + runHook preBuild + PORT=15011 jsonplaceholder & + # assumption: jsonplaceholder start far quicker than cypress run + + export CYPRESS_RUN_BINARY=${cypress}/bin/Cypress + export HOME=$PWD/home + mkdir $HOME + npm run test + runHook postBuild + ''; + installPhase = '' + mkdir $out + cp -r cypress/videos $out/ + ''; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix new file mode 100644 index 00000000000..c2b723195b7 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix @@ -0,0 +1,567 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <<EOF + #! ${stdenv.shell} -e + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore + EOF + + chmod +x $out/bin/tar + ''; + + # Function that generates a TGZ file from a NPM project + buildNodeSourceDist = + { name, version, src, ... }: + + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <<EOF + #! ${stdenv.shell} -e + $shellHook + exec ${stdenv.shell} + EOF + chmod +x $out/bin/shell + ''; + + # Provide the dependencies in a development shell through the NODE_PATH environment variable + inherit nodeDependencies; + shellHook = lib.optionalString (dependencies != []) '' + export NODE_PATH=${nodeDependencies}/lib/node_modules + export PATH="${nodeDependencies}/bin:$PATH" + ''; + }; +in +{ + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeDependencies = lib.makeOverridable buildNodeDependencies; + buildNodeShell = lib.makeOverridable buildNodeShell; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix new file mode 100644 index 00000000000..08a39661a34 --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix @@ -0,0 +1,10290 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, callPackage, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.8.3" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; + }; + }; + "@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/highlight-7.9.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; + }; + }; + "@babel/runtime-7.9.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; + sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; + }; + }; + "@bahmutov/print-env-1.2.0" = { + name = "_at_bahmutov_slash_print-env"; + packageName = "@bahmutov/print-env"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bahmutov/print-env/-/print-env-1.2.0.tgz"; + sha512 = "Vf4AX+maJYV6f0RCUjmCsv6dcJPdPp33By8orMU1enb3t867xTGERhfn7aBdeisSKYJ3Dau5nwCiR2sGPSoS+w=="; + }; + }; + "@cypress/eslint-plugin-dev-5.0.0" = { + name = "_at_cypress_slash_eslint-plugin-dev"; + packageName = "@cypress/eslint-plugin-dev"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cypress/eslint-plugin-dev/-/eslint-plugin-dev-5.0.0.tgz"; + sha512 = "wAvXudTesd75WKnO8PWtCy7bRuoG1v2JctfedtXn8uNN7M862WvkdXZaluW8Ex/Ahj6VI6fh4hfhdFzxhlF83Q=="; + }; + }; + "@cypress/listr-verbose-renderer-0.4.1" = { + name = "_at_cypress_slash_listr-verbose-renderer"; + packageName = "@cypress/listr-verbose-renderer"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz"; + sha1 = "a77492f4b11dcc7c446a34b3e28721afd33c642a"; + }; + }; + "@cypress/request-2.88.5" = { + name = "_at_cypress_slash_request"; + packageName = "@cypress/request"; + version = "2.88.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz"; + sha512 = "TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA=="; + }; + }; + "@cypress/xvfb-1.2.4" = { + name = "_at_cypress_slash_xvfb"; + packageName = "@cypress/xvfb"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz"; + sha512 = "skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q=="; + }; + }; + "@hapi/address-2.1.4" = { + name = "_at_hapi_slash_address"; + packageName = "@hapi/address"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; + }; + }; + "@hapi/bourne-1.3.2" = { + name = "_at_hapi_slash_bourne"; + packageName = "@hapi/bourne"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; + sha1 = "0a7095adea067243ce3283e1b56b8a8f453b242a"; + }; + }; + "@hapi/hoek-8.5.1" = { + name = "_at_hapi_slash_hoek"; + packageName = "@hapi/hoek"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; + }; + }; + "@hapi/joi-15.1.1" = { + name = "_at_hapi_slash_joi"; + packageName = "@hapi/joi"; + version = "15.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; + sha1 = "c675b8a71296f02833f8d6d243b34c57b8ce19d7"; + }; + }; + "@hapi/topo-3.1.6" = { + name = "_at_hapi_slash_topo"; + packageName = "@hapi/topo"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; + sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; + }; + }; + "@koa/cors-3.1.0" = { + name = "_at_koa_slash_cors"; + packageName = "@koa/cors"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@koa/cors/-/cors-3.1.0.tgz"; + sha512 = "7ulRC1da/rBa6kj6P4g2aJfnET3z8Uf3SWu60cjbtxTA5g8lxRdX/Bd2P92EagGwwAhANeNw8T8if99rJliR6Q=="; + }; + }; + "@mrmlnc/readdir-enhanced-2.2.1" = { + name = "_at_mrmlnc_slash_readdir-enhanced"; + packageName = "@mrmlnc/readdir-enhanced"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; + }; + }; + "@nodelib/fs.scandir-2.1.3" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + }; + }; + "@nodelib/fs.stat-1.1.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; + }; + }; + "@nodelib/fs.stat-2.0.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + }; + }; + "@nodelib/fs.walk-1.2.4" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + }; + }; + "@octokit/auth-token-2.4.0" = { + name = "_at_octokit_slash_auth-token"; + packageName = "@octokit/auth-token"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz"; + sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg=="; + }; + }; + "@octokit/endpoint-6.0.1" = { + name = "_at_octokit_slash_endpoint"; + packageName = "@octokit/endpoint"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz"; + sha512 = "pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A=="; + }; + }; + "@octokit/plugin-paginate-rest-1.1.2" = { + name = "_at_octokit_slash_plugin-paginate-rest"; + packageName = "@octokit/plugin-paginate-rest"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz"; + sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; + }; + }; + "@octokit/plugin-request-log-1.0.0" = { + name = "_at_octokit_slash_plugin-request-log"; + packageName = "@octokit/plugin-request-log"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz"; + sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="; + }; + }; + "@octokit/plugin-rest-endpoint-methods-2.4.0" = { + name = "_at_octokit_slash_plugin-rest-endpoint-methods"; + packageName = "@octokit/plugin-rest-endpoint-methods"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz"; + sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; + }; + }; + "@octokit/request-5.4.2" = { + name = "_at_octokit_slash_request"; + packageName = "@octokit/request"; + version = "5.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz"; + sha512 = "zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw=="; + }; + }; + "@octokit/request-error-1.2.1" = { + name = "_at_octokit_slash_request-error"; + packageName = "@octokit/request-error"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.1.tgz"; + sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; + }; + }; + "@octokit/request-error-2.0.0" = { + name = "_at_octokit_slash_request-error"; + packageName = "@octokit/request-error"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz"; + sha512 = "rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw=="; + }; + }; + "@octokit/rest-16.43.1" = { + name = "_at_octokit_slash_rest"; + packageName = "@octokit/rest"; + version = "16.43.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz"; + sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; + }; + }; + "@octokit/types-2.11.1" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "2.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/types/-/types-2.11.1.tgz"; + sha512 = "QaLoLkmFdfoNbk3eOzPv7vKrUY0nRJIYmZDoz/pTer4ICpqu80aSQTVHnnUxEFuURCiidig76CcxUOYC/bY3RQ=="; + }; + }; + "@samverschueren/stream-to-observable-0.3.1" = { + name = "_at_samverschueren_slash_stream-to-observable"; + packageName = "@samverschueren/stream-to-observable"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; + sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; + }; + }; + "@semantic-release/commit-analyzer-6.3.3" = { + name = "_at_semantic-release_slash_commit-analyzer"; + packageName = "@semantic-release/commit-analyzer"; + version = "6.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-6.3.3.tgz"; + sha512 = "Pyv1ZL2u5AIOY4YbxFCAB5J1PEh5yON8ylbfiPiriDGGW6Uu1U3Y8lysMtWu+FUD5x7tSnyIzhqx0+fxPxqbgw=="; + }; + }; + "@semantic-release/error-2.2.0" = { + name = "_at_semantic-release_slash_error"; + packageName = "@semantic-release/error"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@semantic-release/error/-/error-2.2.0.tgz"; + sha512 = "9Tj/qn+y2j+sjCI3Jd+qseGtHjOAeg7dU2/lVcqIQ9TV3QDaDXDYXcoOHU+7o2Hwh8L8ymL4gfuO7KxDs3q2zg=="; + }; + }; + "@semantic-release/github-5.5.8" = { + name = "_at_semantic-release_slash_github"; + packageName = "@semantic-release/github"; + version = "5.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@semantic-release/github/-/github-5.5.8.tgz"; + sha512 = "YxbBXbCThs/Xk3E4QU01AMIUM8eb0UTvjHJtclTDR3/DEW7kUpmXQqBMnSh3qCTuk4scRFIoaF0fGU/0xByZug=="; + }; + }; + "@semantic-release/npm-5.3.5" = { + name = "_at_semantic-release_slash_npm"; + packageName = "@semantic-release/npm"; + version = "5.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@semantic-release/npm/-/npm-5.3.5.tgz"; + sha512 = "AOREQ6rUT8OAiqXvWCp0kMNjcdnLLq1JdP0voZL4l5zf6Tgs/65YA7ctP+9shthW01Ps85Nu0pILW3p9GkaYuw=="; + }; + }; + "@semantic-release/release-notes-generator-7.3.5" = { + name = "_at_semantic-release_slash_release-notes-generator"; + packageName = "@semantic-release/release-notes-generator"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@semantic-release/release-notes-generator/-/release-notes-generator-7.3.5.tgz"; + sha512 = "LGjgPBGjjmjap/76O0Md3wc04Y7IlLnzZceLsAkcYRwGQdRPTTFUJKqDQTuieWTs7zfHzQoZqsqPfFxEN+g2+Q=="; + }; + }; + "@sindresorhus/is-2.1.1" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; + }; + }; + "@szmarczak/http-timer-4.0.5" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; + sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; + }; + }; + "@tootallnate/once-1.1.2" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + }; + "@types/cacheable-request-6.0.1" = { + name = "_at_types_slash_cacheable-request"; + packageName = "@types/cacheable-request"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz"; + sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; + }; + }; + "@types/color-name-1.1.1" = { + name = "_at_types_slash_color-name"; + packageName = "@types/color-name"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + }; + }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/http-cache-semantics-4.0.0" = { + name = "_at_types_slash_http-cache-semantics"; + packageName = "@types/http-cache-semantics"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; + sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; + }; + }; + "@types/keyv-3.1.1" = { + name = "_at_types_slash_keyv"; + packageName = "@types/keyv"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz"; + sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-13.13.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "13.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-13.13.0.tgz"; + sha512 = "WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A=="; + }; + }; + "@types/node-14.17.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz"; + sha512 = "w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA=="; + }; + }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; + "@types/parse-json-4.0.0" = { + name = "_at_types_slash_parse-json"; + packageName = "@types/parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + }; + }; + "@types/responselike-1.0.0" = { + name = "_at_types_slash_responselike"; + packageName = "@types/responselike"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; + }; + }; + "@types/retry-0.12.0" = { + name = "_at_types_slash_retry"; + packageName = "@types/retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; + sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; + }; + }; + "@types/sinonjs__fake-timers-6.0.2" = { + name = "_at_types_slash_sinonjs__fake-timers"; + packageName = "@types/sinonjs__fake-timers"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz"; + sha512 = "dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg=="; + }; + }; + "@types/sizzle-2.3.3" = { + name = "_at_types_slash_sizzle"; + packageName = "@types/sizzle"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; + }; + }; + "@types/yauzl-2.9.1" = { + name = "_at_types_slash_yauzl"; + packageName = "@types/yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; + }; + }; + "@zeit/schemas-2.6.0" = { + name = "_at_zeit_slash_schemas"; + packageName = "@zeit/schemas"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.6.0.tgz"; + sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; + }; + }; + "JSONStream-1.3.5" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz"; + sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-7.2.0" = { + name = "acorn"; + packageName = "acorn"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz"; + sha512 = "apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="; + }; + }; + "acorn-jsx-5.2.0" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; + }; + }; + "agent-base-5.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz"; + sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="; + }; + }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; + "aggregate-error-3.0.1" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA=="; + }; + }; + "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.5.3" = { + name = "ajv"; + packageName = "ajv"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz"; + sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; + }; + }; + "ansi-align-2.0.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + }; + "ansi-escape-sequences-5.1.2" = { + name = "ansi-escape-sequences"; + packageName = "ansi-escape-sequences"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz"; + sha512 = "JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw=="; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-escapes-4.3.1" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + }; + "any-observable-0.3.0" = { + name = "any-observable"; + packageName = "any-observable"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz"; + sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "arch-2.1.1" = { + name = "arch"; + packageName = "arch"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz"; + sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="; + }; + }; + "arch-2.2.0" = { + name = "arch"; + packageName = "arch"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + }; + "arg-2.0.0" = { + name = "arg"; + packageName = "arg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz"; + sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "argv-formatter-1.0.0" = { + name = "argv-formatter"; + packageName = "argv-formatter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/argv-formatter/-/argv-formatter-1.0.0.tgz"; + sha1 = "a0ca0cbc29a5b73e836eebe1cbf6c5e0e4eb82f9"; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-back-3.1.0" = { + name = "array-back"; + packageName = "array-back"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz"; + sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; + }; + }; + "array-back-4.0.1" = { + name = "array-back"; + packageName = "array-back"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; + sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; + }; + }; + "array-find-index-1.0.2" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "arrify-1.0.1" = { + name = "arrify"; + packageName = "arrify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "async-3.2.0" = { + name = "async"; + packageName = "async"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "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"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "atob-lite-2.0.0" = { + name = "atob-lite"; + packageName = "atob-lite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz"; + sha1 = "0fef5ad46f1bd7a8502c65727f0367d5ee43d696"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.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=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "basic-auth-2.0.1" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; + }; + }; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "before-after-hook-2.1.0" = { + name = "before-after-hook"; + packageName = "before-after-hook"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz"; + sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; + }; + }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; + "blob-util-2.0.2" = { + name = "blob-util"; + packageName = "blob-util"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz"; + sha512 = "T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ=="; + }; + }; + "bluebird-3.5.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; + sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + }; + }; + "bluebird-3.7.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz"; + sha1 = "df70e302b471d7473489acf26a93d63b53f874de"; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; + "bottleneck-2.19.5" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "2.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz"; + sha512 = "VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="; + }; + }; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + }; + "btoa-lite-1.0.0" = { + name = "btoa-lite"; + packageName = "btoa-lite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz"; + sha1 = "337766da15801210fdd956c22e9c6891ab9d0337"; + }; + }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "byte-size-6.2.0" = { + name = "byte-size"; + packageName = "byte-size"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz"; + sha512 = "6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA=="; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "cache-content-type-1.0.1" = { + name = "cache-content-type"; + packageName = "cache-content-type"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz"; + sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA=="; + }; + }; + "cacheable-lookup-2.0.1" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; + }; + }; + "cacheable-request-7.0.1" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; + sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; + }; + }; + "cachedir-2.3.0" = { + name = "cachedir"; + packageName = "cachedir"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"; + sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; + }; + }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "camelcase-keys-4.2.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + }; + }; + "cardinal-2.1.1" = { + name = "cardinal"; + packageName = "cardinal"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; + sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; + "chalk-4.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz"; + sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; + }; + }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; + "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=="; + }; + }; + "chdir-promise-0.4.0" = { + name = "chdir-promise"; + packageName = "chdir-promise"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chdir-promise/-/chdir-promise-0.4.0.tgz"; + sha1 = "46dc602ed193197470140f152459a4382cf79974"; + }; + }; + "check-more-types-2.23.0" = { + name = "check-more-types"; + packageName = "check-more-types"; + version = "2.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/check-more-types/-/check-more-types-2.23.0.tgz"; + sha1 = "6226264d30b1095aa1c0a5b874edbdd5d2d0a66f"; + }; + }; + "check-more-types-2.24.0" = { + name = "check-more-types"; + packageName = "check-more-types"; + version = "2.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz"; + sha1 = "1420ffb10fd444dcfc79b43891bbfffd32a84600"; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; + "ci-info-3.1.1" = { + name = "ci-info"; + packageName = "ci-info"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz"; + sha512 = "kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ=="; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "clean-stack-2.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-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-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + }; + }; + "cli-table3-0.6.0" = { + name = "cli-table3"; + packageName = "cli-table3"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz"; + sha512 = "gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ=="; + }; + }; + "cli-truncate-0.2.1" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz"; + sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; + }; + }; + "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=="; + }; + }; + "clipboardy-1.2.3" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz"; + sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA=="; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "co-body-6.1.0" = { + name = "co-body"; + packageName = "co-body"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-body/-/co-body-6.1.0.tgz"; + sha512 = "m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "colon-names-1.0.0" = { + name = "colon-names"; + packageName = "colon-names"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colon-names/-/colon-names-1.0.0.tgz"; + sha512 = "9KSE6zbPFIMLUOTfeZyDyS8RUfpgo/1l9FD4ACJjzwz5mKBFuBspEed5lL7CXZRxSrba0YH/pMEASRtMj3O71Q=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "colors-1.0.3" = { + name = "colors"; + packageName = "colors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + }; + }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + }; + }; + "colors-1.4.0" = { + name = "colors"; + packageName = "colors"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + }; + "command-line-args-5.1.1" = { + name = "command-line-args"; + packageName = "command-line-args"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz"; + sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg=="; + }; + }; + "command-line-usage-6.1.1" = { + name = "command-line-usage"; + packageName = "command-line-usage"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz"; + sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA=="; + }; + }; + "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-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "commander-5.1.0" = { + name = "commander"; + packageName = "commander"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; + }; + }; + "common-log-format-1.0.0" = { + name = "common-log-format"; + packageName = "common-log-format"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-log-format/-/common-log-format-1.0.0.tgz"; + sha512 = "fFn/WPNbsTCGTTwdCpZfVZSa5mgqMEkA0gMTRApFSlEsYN+9B2FPfiqch5FT+jsv5IV1RHV3GeZvCa7Qg+jssw=="; + }; + }; + "common-tags-1.8.0" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; + }; + }; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.3" = { + name = "compression"; + packageName = "compression"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz"; + sha512 = "HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "content-disposition-0.5.2" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "conventional-changelog-angular-5.0.6" = { + name = "conventional-changelog-angular"; + packageName = "conventional-changelog-angular"; + version = "5.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz"; + sha512 = "QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA=="; + }; + }; + "conventional-changelog-writer-4.0.11" = { + name = "conventional-changelog-writer"; + packageName = "conventional-changelog-writer"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz"; + sha512 = "g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw=="; + }; + }; + "conventional-commits-filter-2.0.2" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz"; + sha512 = "WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ=="; + }; + }; + "conventional-commits-parser-3.0.8" = { + name = "conventional-commits-parser"; + packageName = "conventional-commits-parser"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz"; + sha512 = "YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ=="; + }; + }; + "cookies-0.8.0" = { + name = "cookies"; + packageName = "cookies"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz"; + sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "copy-to-2.0.1" = { + name = "copy-to"; + packageName = "copy-to"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz"; + sha1 = "2680fbb8068a48d08656b6098092bdafc906f4a5"; + }; + }; + "core-js-2.6.11" = { + name = "core-js"; + packageName = "core-js"; + version = "2.6.11"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "cosmiconfig-5.2.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; + }; + }; + "cosmiconfig-6.0.0" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; + }; + }; + "create-mixin-3.0.0" = { + name = "create-mixin"; + packageName = "create-mixin"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-mixin/-/create-mixin-3.0.0.tgz"; + sha512 = "LkdMqnWT9LaqBN4huqpUnMz56Yr1mVSoCduAd2xXefgH/YZP2sXCMAyztXjk4q8hTF/TlcDa+zQW2aTgGdjjKQ=="; + }; + }; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "cross-spawn-7.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; + sha512 = "PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw=="; + }; + }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "cypress-7.3.0" = { + name = "cypress"; + packageName = "cypress"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cypress/-/cypress-7.3.0.tgz"; + sha512 = "aseRCH1tRVCrM6oEfja6fR/bo5l6e4SkHRRSATh27UeN4f/ANC8U7tGIulmrISJVy9xuOkOdbYKbUb2MNM+nrw=="; + }; + }; + "d3-helpers-0.3.0" = { + name = "d3-helpers"; + packageName = "d3-helpers"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-helpers/-/d3-helpers-0.3.0.tgz"; + sha1 = "4b31dce4a2121a77336384574d893fbed5fb293d"; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "date-fns-1.30.1" = { + name = "date-fns"; + packageName = "date-fns"; + version = "1.30.1"; + src = fetchurl { + url = "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz"; + sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; + }; + }; + "dateformat-3.0.3" = { + name = "dateformat"; + packageName = "dateformat"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; + sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; + }; + }; + "dayjs-1.10.4" = { + name = "dayjs"; + packageName = "dayjs"; + version = "1.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz"; + sha512 = "RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="; + }; + }; + "debug-2.6.3" = { + name = "debug"; + packageName = "debug"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "debug-4.3.1" = { + name = "debug"; + packageName = "debug"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + }; + }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decamelize-keys-1.1.0" = { + name = "decamelize-keys"; + packageName = "decamelize-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-response-5.0.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; + sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; + }; + }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "defer-to-connect-2.0.1" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; + sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; + "deprecation-2.3.1" = { + name = "deprecation"; + packageName = "deprecation"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"; + sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-indent-6.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz"; + sha512 = "oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA=="; + }; + }; + "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=="; + }; + }; + "devtools-protocol-0.0.847576" = { + name = "devtools-protocol"; + packageName = "devtools-protocol"; + version = "0.0.847576"; + src = fetchurl { + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz"; + sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg=="; + }; + }; + "diff-match-patch-1.0.4" = { + name = "diff-match-patch"; + packageName = "diff-match-patch"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; + sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="; + }; + }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + }; + "doctrine-3.0.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "elegant-spinner-1.0.1" = { + name = "elegant-spinner"; + packageName = "elegant-spinner"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; + sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "env-ci-4.5.2" = { + name = "env-ci"; + packageName = "env-ci"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/env-ci/-/env-ci-4.5.2.tgz"; + sha512 = "lS+edpNp2+QXEPkx6raEMIjKxKKWnJ4+VWzovYJ2NLYiJAYenSAXotFfVdgaFxdbVnvAbUI8epQDa1u12ERxfQ=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "es-abstract-1.17.5" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; + }; + }; + "es-to-primitive-1.2.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "eslint-7.0.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.0.0.tgz"; + sha512 = "qY1cwdOxMONHJfGqw52UOpZDeqXy8xmD0u8CT6jIstil72jkhURC704W8CFyTPDPllz4z4lu0Ql1+07PG/XdIg=="; + }; + }; + "eslint-plugin-cypress-2.8.1" = { + name = "eslint-plugin-cypress"; + packageName = "eslint-plugin-cypress"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.8.1.tgz"; + sha512 = "jDpcP+MmjmqQO/x3bwIXgp4cl7Q66RYS5/IsuOQP4Qo2sEqE3DI8tTxBQ1EhnV5qEDd2Z2TYHR+5vYI6oCN4uw=="; + }; + }; + "eslint-plugin-json-format-2.0.1" = { + name = "eslint-plugin-json-format"; + packageName = "eslint-plugin-json-format"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-json-format/-/eslint-plugin-json-format-2.0.1.tgz"; + sha512 = "eWT0sNqIEYzKqbej2dvz+/oQ4JQxthE3i+izjInIdfbsPfVgBtiWbmagkgKStje0LJqo9FATx1LWl6xcuxqsBQ=="; + }; + }; + "eslint-plugin-mocha-5.3.0" = { + name = "eslint-plugin-mocha"; + packageName = "eslint-plugin-mocha"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-5.3.0.tgz"; + sha512 = "3uwlJVLijjEmBeNyH60nzqgA1gacUWLUmcKV8PIGNvj1kwP/CTgAWQHn2ayyJVwziX+KETkr9opNwT1qD/RZ5A=="; + }; + }; + "eslint-rule-composer-0.3.0" = { + name = "eslint-rule-composer"; + packageName = "eslint-rule-composer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; + sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; + }; + }; + "eslint-scope-5.0.0" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; + sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + }; + }; + "eslint-utils-2.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha512 = "0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="; + }; + }; + "eslint-visitor-keys-1.1.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + }; + }; + "espree-7.0.0" = { + name = "espree"; + packageName = "espree"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz"; + sha512 = "/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw=="; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esquery-1.3.1" = { + name = "esquery"; + packageName = "esquery"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "estraverse-5.1.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; + sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "eventemitter2-6.4.4" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "6.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz"; + sha512 = "HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="; + }; + }; + "execa-0.7.0" = { + name = "execa"; + packageName = "execa"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + }; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + }; + }; + "execa-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "execa-2.0.5" = { + name = "execa"; + packageName = "execa"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-2.0.5.tgz"; + sha512 = "SwmwZZyJjflcqLSgllk4EQlMLst2p9muyzwNugKGFlpAz6rZ7M+s2nBR97GAq4Vzjwx2y9rcMcmqzojwN+xwNA=="; + }; + }; + "execa-2.1.0" = { + name = "execa"; + packageName = "execa"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; + sha1 = "e5d3ecd837d2a60ec50f3da78fd39767747bbe99"; + }; + }; + "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.1.0" = { + name = "execa"; + packageName = "execa"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; + }; + }; + "executable-4.1.1" = { + name = "executable"; + packageName = "executable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; + sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; + }; + }; + "exit-hook-1.1.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; + sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + 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"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "extract-zip-1.7.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; + }; + }; + "extract-zip-2.0.1" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-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-glob-2.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; + }; + }; + "fast-glob-3.2.2" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; + sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "fast-url-parser-1.1.3" = { + name = "fast-url-parser"; + packageName = "fast-url-parser"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz"; + sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; + }; + }; + "fastq-1.7.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; + sha512 = "YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ=="; + }; + }; + "fd-slicer-1.1.0" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + }; + "figures-1.7.0" = { + name = "figures"; + packageName = "figures"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; + sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + }; + }; + "figures-2.0.0" = { + name = "figures"; + packageName = "figures"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + }; + "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"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + }; + "find-replace-3.0.0" = { + name = "find-replace"; + packageName = "find-replace"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz"; + sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ=="; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "find-versions-3.2.0" = { + name = "find-versions"; + packageName = "find-versions"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz"; + sha512 = "P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww=="; + }; + }; + "flat-cache-2.0.1" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"; + sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; + }; + }; + "flatted-2.0.2" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from-0.1.7" = { + name = "from"; + packageName = "from"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-extra-8.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + }; + "fs-extra-9.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "functional-red-black-tree-1.0.1" = { + name = "functional-red-black-tree"; + packageName = "functional-red-black-tree"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-stdin-6.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; + sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-stream-5.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + }; + }; + "get-stream-5.2.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getos-3.2.1" = { + name = "getos"; + packageName = "getos"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz"; + sha512 = "U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "ggit-1.15.1" = { + name = "ggit"; + packageName = "ggit"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ggit/-/ggit-1.15.1.tgz"; + sha1 = "80d552e8e1712c9805fe5ba1cf119a4e7e3bd998"; + }; + }; + "git-hooks-list-1.0.3" = { + name = "git-hooks-list"; + packageName = "git-hooks-list"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/git-hooks-list/-/git-hooks-list-1.0.3.tgz"; + sha512 = "Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ=="; + }; + }; + "git-log-parser-1.2.0" = { + name = "git-log-parser"; + packageName = "git-log-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-log-parser/-/git-log-parser-1.2.0.tgz"; + sha1 = "2e6a4c1b13fc00028207ba795a7ac31667b9fd4a"; + }; + }; + "glob-7.1.1" = { + name = "glob"; + packageName = "glob"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; + "glob-to-regexp-0.3.0" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; + sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + }; + }; + "global-dirs-3.0.0" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-12.4.0" = { + name = "globals"; + packageName = "globals"; + version = "12.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "globby-10.0.0" = { + name = "globby"; + packageName = "globby"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.0.tgz"; + sha512 = "3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw=="; + }; + }; + "globby-10.0.2" = { + name = "globby"; + packageName = "globby"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"; + sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; + }; + }; + "globby-9.1.0" = { + name = "globby"; + packageName = "globby"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-9.1.0.tgz"; + sha512 = "VtYjhHr7ncls724Of5W6Kaahz0ag7dB4G62/2HsN+xEKG6SrPzM1AJMerGxQTwJGnN9reeyxdvXbuZYpfssCvg=="; + }; + }; + "got-10.7.0" = { + name = "got"; + packageName = "got"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + }; + }; + "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-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "handlebars-4.7.6" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; + sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-symbols-1.0.1" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "hook-std-2.0.0" = { + name = "hook-std"; + packageName = "hook-std"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hook-std/-/hook-std-2.0.0.tgz"; + sha512 = "zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g=="; + }; + }; + "hosted-git-info-2.8.8" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + }; + }; + "hosted-git-info-3.0.4" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; + sha512 = "4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ=="; + }; + }; + "http-assert-1.4.1" = { + name = "http-assert"; + packageName = "http-assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz"; + sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw=="; + }; + }; + "http-cache-semantics-4.1.0" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; + "http-errors-1.8.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz"; + sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; + }; + }; + "http-proxy-agent-3.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-3.0.0.tgz"; + sha512 = "uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA=="; + }; + }; + "http-proxy-agent-4.0.1" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "https-proxy-agent-4.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha512 = "zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg=="; + }; + }; + "https-proxy-agent-5.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + }; + "human-signals-1.1.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; + }; + }; + "husky-1.3.1" = { + name = "husky"; + packageName = "husky"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz"; + sha512 = "86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "ignore-4.0.6" = { + name = "ignore"; + packageName = "ignore"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; + }; + }; + "ignore-5.1.4" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; + sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + }; + }; + "import-fresh-2.0.0" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + }; + "import-fresh-3.2.1" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + }; + }; + "import-from-3.0.0" = { + name = "import-from"; + packageName = "import-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz"; + sha512 = "CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "inflation-2.0.0" = { + name = "inflation"; + packageName = "inflation"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"; + sha1 = "8b417e47c28f925a45133d914ca1fd389107f30f"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "ini-2.0.0" = { + name = "ini"; + packageName = "ini"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; + }; + }; + "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" = { + name = "interpret"; + packageName = "interpret"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + }; + }; + "into-stream-5.1.1" = { + name = "into-stream"; + packageName = "into-stream"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-5.1.1.tgz"; + sha512 = "krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA=="; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-callable-1.1.5" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; + }; + }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; + "is-ci-3.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz"; + sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.2" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-directory-0.3.1" = { + name = "is-directory"; + packageName = "is-directory"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + }; + "is-docker-2.1.1" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-generator-function-1.0.8" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz"; + sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ=="; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-installed-globally-0.4.0" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "is-observable-1.1.0" = { + name = "is-observable"; + packageName = "is-observable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz"; + sha512 = "NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA=="; + }; + }; + "is-path-inside-3.0.3" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "is-plain-obj-2.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-plain-object-3.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"; + sha512 = "tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg=="; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; + "is-regex-1.0.5" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; + "is-symbol-1.0.3" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + }; + }; + "is-text-path-1.0.1" = { + name = "is-text-path"; + packageName = "is-text-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + 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=="; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "issue-parser-5.0.0" = { + name = "issue-parser"; + packageName = "issue-parser"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/issue-parser/-/issue-parser-5.0.0.tgz"; + sha512 = "q/16W7EPHRL0FKVz9NU++TUsoygXGj6JOi88oulyAcQG+IEZ0T6teVdE+VLbe19OfL/tbV8Wi3Dfo0HedeHW0Q=="; + }; + }; + "java-properties-1.0.2" = { + name = "java-properties"; + packageName = "java-properties"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz"; + sha512 = "qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ=="; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-buffer-3.0.1" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; + }; + }; + "json-fixer-1.4.1" = { + name = "json-fixer"; + packageName = "json-fixer"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-fixer/-/json-fixer-1.4.1.tgz"; + sha512 = "zbvD9byMClUKRcGsazP2WBO5kG6hS8q6oRAuIWiOvhDDN4zFFIC+tPYG0I20Vhxv8S4W1VeHzesWZB0p5pzvlA=="; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsonfile-6.1.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "keygrip-1.1.0" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz"; + sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ=="; + }; + }; + "keyv-4.0.3" = { + name = "keyv"; + packageName = "keyv"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; + sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.3" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + }; + "koa-2.13.1" = { + name = "koa"; + packageName = "koa"; + version = "2.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa/-/koa-2.13.1.tgz"; + sha512 = "Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w=="; + }; + }; + "koa-bodyparser-4.3.0" = { + name = "koa-bodyparser"; + packageName = "koa-bodyparser"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-bodyparser/-/koa-bodyparser-4.3.0.tgz"; + sha512 = "uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw=="; + }; + }; + "koa-compose-3.2.1" = { + name = "koa-compose"; + packageName = "koa-compose"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz"; + sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"; + }; + }; + "koa-compose-4.1.0" = { + name = "koa-compose"; + packageName = "koa-compose"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz"; + sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw=="; + }; + }; + "koa-compress-3.1.0" = { + name = "koa-compress"; + packageName = "koa-compress"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compress/-/koa-compress-3.1.0.tgz"; + sha512 = "0m24/yS/GbhWI+g9FqtvStY+yJwTObwoxOvPok6itVjRen7PBWkjsJ8pre76m+99YybXLKhOJ62mJ268qyBFMQ=="; + }; + }; + "koa-conditional-get-2.0.0" = { + name = "koa-conditional-get"; + packageName = "koa-conditional-get"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-conditional-get/-/koa-conditional-get-2.0.0.tgz"; + sha1 = "a43f3723c1d014b730a34ece8adf30b93c8233f2"; + }; + }; + "koa-convert-1.2.0" = { + name = "koa-convert"; + packageName = "koa-convert"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz"; + sha1 = "da40875df49de0539098d1700b50820cebcd21d0"; + }; + }; + "koa-etag-3.0.0" = { + name = "koa-etag"; + packageName = "koa-etag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-etag/-/koa-etag-3.0.0.tgz"; + sha1 = "9ef7382ddd5a82ab0deb153415c915836f771d3f"; + }; + }; + "koa-is-json-1.0.0" = { + name = "koa-is-json"; + packageName = "koa-is-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; + sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14"; + }; + }; + "koa-json-2.0.2" = { + name = "koa-json"; + packageName = "koa-json"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-json/-/koa-json-2.0.2.tgz"; + sha1 = "36af14e6ea1f5d646d7c44a285701c6f85a4fde4"; + }; + }; + "koa-morgan-1.0.1" = { + name = "koa-morgan"; + packageName = "koa-morgan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-morgan/-/koa-morgan-1.0.1.tgz"; + sha1 = "08052e0ce0d839d3c43178b90a5bb3424bef1f99"; + }; + }; + "koa-range-0.3.0" = { + name = "koa-range"; + packageName = "koa-range"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-range/-/koa-range-0.3.0.tgz"; + sha1 = "3588e3496473a839a1bd264d2a42b1d85bd7feac"; + }; + }; + "koa-route-3.2.0" = { + name = "koa-route"; + packageName = "koa-route"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-route/-/koa-route-3.2.0.tgz"; + sha1 = "76298b99a6bcfa9e38cab6fe5c79a8733e758bce"; + }; + }; + "koa-send-5.0.1" = { + name = "koa-send"; + packageName = "koa-send"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz"; + sha512 = "tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ=="; + }; + }; + "koa-static-5.0.0" = { + name = "koa-static"; + packageName = "koa-static"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz"; + sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ=="; + }; + }; + "lazy-ass-1.5.0" = { + name = "lazy-ass"; + packageName = "lazy-ass"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.5.0.tgz"; + sha1 = "ca15be243c7c475b8565cdbfa0f9c2f374f2a01d"; + }; + }; + "lazy-ass-1.6.0" = { + name = "lazy-ass"; + packageName = "lazy-ass"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"; + sha1 = "7999655e8646c17f089fdd187d150d3324d54513"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "leprechaun-0.0.2" = { + name = "leprechaun"; + packageName = "leprechaun"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leprechaun/-/leprechaun-0.0.2.tgz"; + sha1 = "8b96514a9e634c53fbe59a8094f3378c8fb2084d"; + }; + }; + "levn-0.4.1" = { + name = "levn"; + packageName = "levn"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; + }; + }; + "line-column-1.0.2" = { + name = "line-column"; + packageName = "line-column"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; + sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + }; + }; + "lines-and-columns-1.1.6" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + }; + "listr-0.14.3" = { + name = "listr"; + packageName = "listr"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz"; + sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA=="; + }; + }; + "listr-silent-renderer-1.1.1" = { + name = "listr-silent-renderer"; + packageName = "listr-silent-renderer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; + sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; + }; + }; + "listr-update-renderer-0.5.0" = { + name = "listr-update-renderer"; + packageName = "listr-update-renderer"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; + sha512 = "tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA=="; + }; + }; + "listr-verbose-renderer-0.5.0" = { + name = "listr-verbose-renderer"; + packageName = "listr-verbose-renderer"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; + sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; + }; + }; + "load-json-file-4.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "load-module-3.0.0" = { + name = "load-module"; + packageName = "load-module"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-module/-/load-module-3.0.0.tgz"; + sha512 = "ZqprfrTx4vfH5+1mgpspPh5JYsNyA193NkMUdb3GwpmVqMczOh8cUDJgZBmEZVlSR42JBGYTUxlBAX9LHIBtIA=="; + }; + }; + "local-web-server-4.2.1" = { + name = "local-web-server"; + packageName = "local-web-server"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/local-web-server/-/local-web-server-4.2.1.tgz"; + sha512 = "v71LZool2w7uYA+tDP5HhfjzUxz5SFfcrPPB/zC98yFFawt7A6fcmAr2MR4Q9AHk/A8oyd/wrhEJBJLndwHxNQ=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-3.10.1" = { + name = "lodash"; + packageName = "lodash"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.assignwith-4.2.0" = { + name = "lodash.assignwith"; + packageName = "lodash.assignwith"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; + sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + }; + }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + }; + "lodash.capitalize-4.2.1" = { + name = "lodash.capitalize"; + packageName = "lodash.capitalize"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; + sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; + }; + }; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.ismatch-4.4.0" = { + name = "lodash.ismatch"; + packageName = "lodash.ismatch"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz"; + sha1 = "756cb5150ca3ba6f11085a78849645f188f85f37"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + }; + "lodash.isstring-4.0.1" = { + name = "lodash.isstring"; + packageName = "lodash.isstring"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + }; + }; + "lodash.set-4.3.2" = { + name = "lodash.set"; + packageName = "lodash.set"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; + sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + }; + }; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; + }; + }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; + "lodash.toarray-4.4.0" = { + name = "lodash.toarray"; + packageName = "lodash.toarray"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; + sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "lodash.uniqby-4.7.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; + "log-update-2.3.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "lws-3.1.0" = { + name = "lws"; + packageName = "lws"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws/-/lws-3.1.0.tgz"; + sha512 = "I8rTgZxz8OJL0hjdlDxs6WpcVG7WSyalVHPQXXK+WPNVjm3KhkT5gV0Qmsgm2FRLbRUp15tso80xmDxMsyt7zA=="; + }; + }; + "lws-basic-auth-2.0.0" = { + name = "lws-basic-auth"; + packageName = "lws-basic-auth"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-basic-auth/-/lws-basic-auth-2.0.0.tgz"; + sha512 = "zzyoGFLQPuKaQJvHMLmmSyfT6lIvocwcDXllTVW5brD0t0YgHYopILkzja+x+MIlJX/YhNKniaTSasujniYVjw=="; + }; + }; + "lws-blacklist-3.0.0" = { + name = "lws-blacklist"; + packageName = "lws-blacklist"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-blacklist/-/lws-blacklist-3.0.0.tgz"; + sha512 = "KNXGDBmbj+UGfWMBAefe2vrfuWpEQms/9Fd7kfMScTqAKF6nrVoEs4pkxfefArG3bX0bu7jWLyB4tJGma5WC6Q=="; + }; + }; + "lws-body-parser-2.0.0" = { + name = "lws-body-parser"; + packageName = "lws-body-parser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-body-parser/-/lws-body-parser-2.0.0.tgz"; + sha512 = "QFDzln3sSdKWL9fVNWy2+ZmrKy/XaYRO0/FFB0MBrDCsNnzepeCD4I7rOOfyuphLn42yR8XUpWdcJ3Ii5aauRA=="; + }; + }; + "lws-compress-2.0.0" = { + name = "lws-compress"; + packageName = "lws-compress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-compress/-/lws-compress-2.0.0.tgz"; + sha512 = "5qDXI9pukVYWm07WjAOfpItLXKtL8lCHvjmW4RiXULhTRJj1qqBjNcmqReyk8L7NLUKhc+8eqoDDJFKURQEp0w=="; + }; + }; + "lws-conditional-get-2.0.0" = { + name = "lws-conditional-get"; + packageName = "lws-conditional-get"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-conditional-get/-/lws-conditional-get-2.0.0.tgz"; + sha512 = "U05yDlFJKIYa7gJZYfnc1HIEuXbKpDJztgkvNYyxCqJC28j/k9ORoNnFNOIHpBh/jlPJgV8x7uH34mIxFAryWA=="; + }; + }; + "lws-cors-3.0.0" = { + name = "lws-cors"; + packageName = "lws-cors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-cors/-/lws-cors-3.0.0.tgz"; + sha512 = "diUkoyVZyzLB8LamdtUYYAfJdPAyu/+IjE3ZUcdnNQz9koECe4O2x3SWD7LSV43pd3CKgyiwwSxWJ4hTBZFIvQ=="; + }; + }; + "lws-index-2.0.0" = { + name = "lws-index"; + packageName = "lws-index"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-index/-/lws-index-2.0.0.tgz"; + sha512 = "qfkeQmKYnd13LmQubzI5LtFV2N8PJQG4QvgSoefoiB3dWre9k2T4C7ajjOTKO8mgSzYpUEREduNcQcLyt62n0g=="; + }; + }; + "lws-json-2.0.0" = { + name = "lws-json"; + packageName = "lws-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-json/-/lws-json-2.0.0.tgz"; + sha512 = "vqUFrAQ5BGpkMS2Mm/ZhgvUMi6Tgia7YtESG7pKjNoiSsD+TxncG0nqp8YjUh2xrEzi/SYFc/ed+9ZOl/t0A0g=="; + }; + }; + "lws-log-2.0.0" = { + name = "lws-log"; + packageName = "lws-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-log/-/lws-log-2.0.0.tgz"; + sha512 = "YveoazSZ0Qb1Tljdm8G8yn9c+mAMXgvLMACZzh5aZIk7p8YJwiXf9r1S+xY7wbXEcKG629KfVO0B5G5gRFcyDQ=="; + }; + }; + "lws-mime-2.0.0" = { + name = "lws-mime"; + packageName = "lws-mime"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-mime/-/lws-mime-2.0.0.tgz"; + sha512 = "mfrAgRQ5+hkQ7LJ6EAgwnUeymNeYxwLXZY3UQ6C2hSTr7BqMSzm9k5O0C8wWP2dzdhChzITYKwzWbUnAYVBwtA=="; + }; + }; + "lws-range-3.0.0" = { + name = "lws-range"; + packageName = "lws-range"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-range/-/lws-range-3.0.0.tgz"; + sha512 = "7ZhA/LqQnKjolKBo/2BFj9DyDDXcJGY3v05TwYRD0qDGrxW4vuatEjluC3SV7ZO/k4PxDLdxuk+RCgL5t3ThtQ=="; + }; + }; + "lws-request-monitor-2.0.0" = { + name = "lws-request-monitor"; + packageName = "lws-request-monitor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-request-monitor/-/lws-request-monitor-2.0.0.tgz"; + sha512 = "ZTo0/pS42qiejcYlL+wlpurSbDSS0J7pDDohqBx7jjUQkgni2Qd8cPzn/kW8QI82gXgDmdZH+ps0vheLHlgdgg=="; + }; + }; + "lws-rewrite-3.1.1" = { + name = "lws-rewrite"; + packageName = "lws-rewrite"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-rewrite/-/lws-rewrite-3.1.1.tgz"; + sha512 = "cOeaPXIlLUVLxS6BZ52QzZVzI8JjCzlWD4RWizB5Hd+0YGO0SPa3Vgk7CIghtAOsSdjtXg/wSOap2H1h+tw8BQ=="; + }; + }; + "lws-spa-3.0.0" = { + name = "lws-spa"; + packageName = "lws-spa"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-spa/-/lws-spa-3.0.0.tgz"; + sha512 = "Tz10LfuOTUsRG6z+OCJ/vBN+4LQWoAGIJ1R02CFPrDk0pY3rHezM7/cCpq6Z6dXD+ipdNE8alkVn4zL2M+eVGg=="; + }; + }; + "lws-static-2.0.0" = { + name = "lws-static"; + packageName = "lws-static"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lws-static/-/lws-static-2.0.0.tgz"; + sha512 = "P25A0+IXdkB6Y6gZAG7X0mnaa+FJ8aTiWLUgM5kazaWmruRO7lyhSjitsA3y5TLI3DpPCZn0mWE4SRREujUZLg=="; + }; + }; + "macos-release-2.3.0" = { + name = "macos-release"; + packageName = "macos-release"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz"; + sha512 = "OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "map-obj-2.0.0" = { + name = "map-obj"; + packageName = "map-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "marked-0.7.0" = { + name = "marked"; + packageName = "marked"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz"; + sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; + }; + }; + "marked-terminal-3.3.0" = { + name = "marked-terminal"; + packageName = "marked-terminal"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-3.3.0.tgz"; + sha512 = "+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memorystream-0.3.1" = { + name = "memorystream"; + packageName = "memorystream"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"; + sha1 = "86d7090b30ce455d63fbae12dda51a47ddcaf9b2"; + }; + }; + "meow-5.0.0" = { + name = "meow"; + packageName = "meow"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz"; + sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; + }; + }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + }; + "merge2-1.3.0" = { + name = "merge2"; + packageName = "merge2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; + sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + }; + "mime-2.4.4" = { + name = "mime"; + packageName = "mime"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; + }; + }; + "mime-db-1.33.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; + sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; + }; + }; + "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-types-2.1.18" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.18"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; + sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; + }; + }; + "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=="; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "mimic-response-2.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "minimist-options-3.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; + sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; + }; + }; + "mixin-deep-1.3.2" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; + "modify-values-1.0.1" = { + name = "modify-values"; + packageName = "modify-values"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz"; + sha512 = "xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw=="; + }; + }; + "moment-2.18.1" = { + name = "moment"; + packageName = "moment"; + version = "2.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + }; + }; + "morgan-1.10.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; + }; + }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "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=="; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "nconf-0.10.0" = { + name = "nconf"; + packageName = "nconf"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz"; + sha512 = "fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.1" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + }; + }; + "nerf-dart-1.0.0" = { + name = "nerf-dart"; + packageName = "nerf-dart"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz"; + sha1 = "e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"; + }; + }; + "netlify-plugin-cypress-2.0.0" = { + name = "netlify-plugin-cypress"; + packageName = "netlify-plugin-cypress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-plugin-cypress/-/netlify-plugin-cypress-2.0.0.tgz"; + sha512 = "QLrvGfY9HLgAgUYqNp6a4iTCLKnfrpCAUYToeI85TIRsDx2j51ukv6kHEIO6K9lvfOL7eKme4tLMGw+BS/UmoA=="; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "node-emoji-1.10.0" = { + name = "node-emoji"; + packageName = "node-emoji"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; + sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; + }; + }; + "node-fetch-2.6.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; + sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; + }; + }; + "node-fetch-2.6.1" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + }; + }; + "node-version-matches-2.0.1" = { + name = "node-version-matches"; + packageName = "node-version-matches"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-version-matches/-/node-version-matches-2.0.1.tgz"; + sha512 = "oqk6+05FC0dNVY5NuXuhPEMq+m1b9ZjS9SIhVE9EjwCHZspnmjSO8npbKAEieinR8GeEgbecoQcYIvI/Kwcf6Q=="; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-url-4.5.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; + sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + }; + }; + "npm-6.14.4" = { + name = "npm"; + packageName = "npm"; + version = "6.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz"; + sha512 = "B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw=="; + }; + }; + "npm-run-all-4.1.5" = { + name = "npm-run-all"; + packageName = "npm-run-all"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz"; + sha512 = "Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "npm-run-path-3.1.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"; + sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; + }; + }; + "npm-run-path-4.0.1" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-inspect-1.7.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "octokit-pagination-methods-1.1.0" = { + name = "octokit-pagination-methods"; + packageName = "octokit-pagination-methods"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz"; + sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-1.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; + sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "onetime-5.1.0" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "only-0.0.2" = { + name = "only"; + packageName = "only"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz"; + sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4"; + }; + }; + "open-7.4.2" = { + name = "open"; + packageName = "open"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; + sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "optionator-0.9.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "os-name-3.1.0" = { + name = "os-name"; + packageName = "os-name"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-3.1.0.tgz"; + sha512 = "h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg=="; + }; + }; + "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"; + }; + }; + "ospath-1.2.2" = { + name = "ospath"; + packageName = "ospath"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"; + sha1 = "1276639774a3f8ef2572f7fe4280e0ea4550c07b"; + }; + }; + "p-cancelable-2.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + }; + }; + "p-event-4.2.0" = { + name = "p-event"; + packageName = "p-event"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz"; + sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; + }; + }; + "p-filter-2.1.0" = { + name = "p-filter"; + packageName = "p-filter"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz"; + sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-finally-2.0.1" = { + name = "p-finally"; + packageName = "p-finally"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz"; + sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; + }; + }; + "p-is-promise-3.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; + }; + }; + "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.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + 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-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-reduce-2.1.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz"; + sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; + }; + }; + "p-retry-4.2.0" = { + name = "p-retry"; + packageName = "p-retry"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz"; + sha512 = "jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA=="; + }; + }; + "p-timeout-3.2.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-json-5.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; + sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + 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"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-to-regexp-1.8.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; + }; + }; + "path-to-regexp-2.2.1" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz"; + sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="; + }; + }; + "path-to-regexp-6.2.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz"; + sha512 = "f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "pegjs-0.10.0" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "pidtree-0.3.1" = { + name = "pidtree"; + packageName = "pidtree"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz"; + sha512 = "qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA=="; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pkg-conf-2.1.0" = { + name = "pkg-conf"; + packageName = "pkg-conf"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz"; + sha1 = "2126514ca6f2abfebd168596df18ba57867f0058"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "pkg-dir-4.2.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + }; + "please-upgrade-node-3.2.0" = { + name = "please-upgrade-node"; + packageName = "please-upgrade-node"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg=="; + }; + }; + "pluralize-5.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-5.0.0.tgz"; + sha1 = "e8b9073af9a0cb02e4c2efa95b55bebbdbf01299"; + }; + }; + "pop-iterate-1.0.1" = { + name = "pop-iterate"; + packageName = "pop-iterate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "prelude-ls-1.2.1" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; + }; + }; + "pretty-bytes-5.6.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "progress-2.0.3" = { + name = "progress"; + packageName = "progress"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + }; + "proxy-from-env-1.1.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; + }; + }; + "ps-tree-1.2.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz"; + sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.8.0" = { + name = "psl"; + packageName = "psl"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "puppeteer-7.1.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz"; + sha512 = "lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g=="; + }; + }; + "q-1.1.2" = { + name = "q"; + packageName = "q"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.1.2.tgz"; + sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "q-2.0.3" = { + name = "q"; + packageName = "q"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + }; + }; + "qrcode-terminal-0.12.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha512 = "EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "quick-lru-1.1.0" = { + name = "quick-lru"; + packageName = "quick-lru"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + }; + }; + "quote-0.4.0" = { + name = "quote"; + packageName = "quote"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quote/-/quote-0.4.0.tgz"; + sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; + }; + }; + "ramda-0.26.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz"; + sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; + }; + }; + "ramda-0.27.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz"; + sha512 = "PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw=="; + }; + }; + "ramda-0.9.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ramda/-/ramda-0.9.1.tgz"; + sha1 = "cc914dc3a82c608d003090203787c3f6826c1d87"; + }; + }; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + }; + }; + "raw-body-2.4.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; + sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "read-pkg-4.0.1" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; + sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; + }; + }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; + "read-pkg-up-3.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + "redent-2.0.0" = { + name = "redent"; + packageName = "redent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + }; + }; + "redeyed-2.1.1" = { + name = "redeyed"; + packageName = "redeyed"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; + sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + }; + }; + "reduce-flatten-2.0.0" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz"; + sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; + }; + }; + "reduce-flatten-3.0.0" = { + name = "reduce-flatten"; + packageName = "reduce-flatten"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.0.tgz"; + sha512 = "eczl8wAYBxJ6Egl6I1ECIF+8z6sHu+KE7BzaEDZTpPXKXfy9SUDQlVYwkRcNTjJLC3Iakxbhss50KuT/R6SYfg=="; + }; + }; + "regenerator-runtime-0.13.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "regexpp-3.1.0" = { + name = "regexpp"; + packageName = "regexpp"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; + sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + }; + }; + "registry-auth-token-4.1.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; + sha512 = "9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA=="; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "request-progress-3.0.0" = { + name = "request-progress"; + packageName = "request-progress"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"; + sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "resolve-1.16.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz"; + sha512 = "rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig=="; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "resolve-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + }; + "resolve-from-5.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + }; + "resolve-path-1.4.0" = { + name = "resolve-path"; + packageName = "resolve-path"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz"; + sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "responselike-2.0.0" = { + name = "responselike"; + packageName = "responselike"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; + sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; + }; + }; + "restore-cursor-1.0.1" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; + sha1 = "34661f46886327fed2991479152252df92daa541"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "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"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "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=="; + }; + }; + "run-node-1.0.0" = { + name = "run-node"; + packageName = "run-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz"; + sha512 = "kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A=="; + }; + }; + "run-parallel-1.1.9" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + }; + }; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + }; + "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"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "secure-keys-1.0.0" = { + name = "secure-keys"; + packageName = "secure-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz"; + sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; + }; + }; + "semantic-release-15.13.32" = { + name = "semantic-release"; + packageName = "semantic-release"; + version = "15.13.32"; + src = fetchurl { + url = "https://registry.npmjs.org/semantic-release/-/semantic-release-15.13.32.tgz"; + sha512 = "+K+GS50jBOJQvoByBM119a5ILqKC9mRYirjBWgfredhnORHjlhsPZZz1aRjEWlx6PzKWYLuLBg7F4e3/tm3v9Q=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + }; + }; + "semver-compare-1.0.0" = { + name = "semver-compare"; + packageName = "semver-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + }; + "semver-regex-2.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; + sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; + }; + }; + "serve-11.3.0" = { + name = "serve"; + packageName = "serve"; + version = "11.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve/-/serve-11.3.0.tgz"; + sha512 = "AU0g50Q1y5EVFX56bl0YX5OtVjUX1N737/Htj93dQGKuHiuLvVB45PD8Muar70W6Kpdlz8aNJfoUqTyAq9EE/A=="; + }; + }; + "serve-handler-6.1.2" = { + name = "serve-handler"; + packageName = "serve-handler"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.2.tgz"; + sha512 = "RFh49wX7zJmmOVDcIjiDSJnMH+ItQEvyuYLYuDBVoA/xmQSCuj+uRmk1cmBB5QQlI3qOiWKp6p4DUGY+Z5AB2A=="; + }; + }; + "serve-index-75lb-2.0.1" = { + name = "serve-index-75lb"; + packageName = "serve-index-75lb"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index-75lb/-/serve-index-75lb-2.0.1.tgz"; + sha512 = "/d9r8bqJlFQcwy0a0nb1KnWAA+Mno+V+VaoKocdkbW5aXKRQd/+4bfnRhQRQr6uEoYwTRJ4xgztOyCJvWcpBpQ=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-2.0.1" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; + "shell-quote-1.7.2" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; + sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; + }; + }; + "shelljs-0.8.4" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "signale-1.4.0" = { + name = "signale"; + packageName = "signale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/signale/-/signale-1.4.0.tgz"; + sha512 = "iuh+gPf28RkltuJC7W5MRi6XAjTDCAPC/prJUpQoG4vIP3MJZ+GTydVnodXA7pwvTKb2cA0m9OFZW/cdWy/I/w=="; + }; + }; + "slash-2.0.0" = { + name = "slash"; + packageName = "slash"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; + }; + }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + }; + "slice-ansi-0.0.4" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + }; + "slice-ansi-2.1.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "sort-object-keys-1.1.3" = { + name = "sort-object-keys"; + packageName = "sort-object-keys"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz"; + sha512 = "855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="; + }; + }; + "sort-package-json-1.42.2" = { + name = "sort-package-json"; + packageName = "sort-package-json"; + version = "1.42.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.42.2.tgz"; + sha512 = "B4cIYKeBdNUJXHPxe0G+x3uHHpSWSgJ3z62+W1C28wT1whkEhrz/B3r9lSyW+VVhz1rc+ymGmNkr1mJ323w0xQ=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-resolve-0.5.3" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spawn-error-forwarder-1.0.0" = { + name = "spawn-error-forwarder"; + packageName = "spawn-error-forwarder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz"; + sha1 = "1afd94738e999b0346d7b9fc373be55e07577029"; + }; + }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "split-0.3.3" = { + name = "split"; + packageName = "split"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "split-1.0.1" = { + name = "split"; + packageName = "split"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "split2-1.0.0" = { + name = "split2"; + packageName = "split2"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-1.0.0.tgz"; + sha1 = "52e2e221d88c75f9a73f90556e263ff96772b314"; + }; + }; + "split2-2.2.0" = { + name = "split2"; + packageName = "split2"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; + sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; + }; + }; + "spots-0.4.0" = { + name = "spots"; + packageName = "spots"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spots/-/spots-0.4.0.tgz"; + sha1 = "01eec5efc143669d9d3a20e3eec8b8cbd9842df6"; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + }; + "start-server-and-test-1.10.6" = { + name = "start-server-and-test"; + packageName = "start-server-and-test"; + version = "1.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.10.6.tgz"; + sha1 = "43355173e49a165b0ce9e928733b574bb877379c"; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stop-build-1.1.0" = { + name = "stop-build"; + packageName = "stop-build"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stop-build/-/stop-build-1.1.0.tgz"; + sha1 = "06a7b19d998a436ed3a8bbe96c8fb341e91069be"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "stream-log-stats-3.0.2" = { + name = "stream-log-stats"; + packageName = "stream-log-stats"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-log-stats/-/stream-log-stats-3.0.2.tgz"; + sha512 = "393j7aeF9iRdHvyANqEQU82UQmpw2CTxgsT83caefh+lOxavVLbVrw8Mr4zjXeZLh2+xeHZMKfVx4T0rJ/EchA=="; + }; + }; + "stream-slice-0.1.2" = { + name = "stream-slice"; + packageName = "stream-slice"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz"; + sha1 = "2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"; + }; + }; + "stream-via-1.0.4" = { + name = "stream-via"; + packageName = "stream-via"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz"; + sha512 = "DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ=="; + }; + }; + "streaming-json-stringify-3.1.0" = { + name = "streaming-json-stringify"; + packageName = "streaming-json-stringify"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz"; + sha1 = "80200437a993cc39c4fe00263b7b3b903ac87af5"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + }; + }; + "string-width-4.2.2" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; + sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + }; + }; + "string.prototype.padend-3.1.0" = { + name = "string.prototype.padend"; + packageName = "string.prototype.padend"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz"; + sha512 = "3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA=="; + }; + }; + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; + }; + }; + "string.prototype.trimright-2.1.2" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "strip-final-newline-2.0.0" = { + name = "strip-final-newline"; + packageName = "strip-final-newline"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + }; + "strip-indent-2.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "strip-json-comments-3.1.0" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-7.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; + "supports-hyperlinks-1.0.1" = { + name = "supports-hyperlinks"; + packageName = "supports-hyperlinks"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz"; + sha512 = "HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw=="; + }; + }; + "symbol-observable-1.2.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; + }; + }; + "table-5.4.6" = { + name = "table"; + packageName = "table"; + version = "5.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; + }; + }; + "table-layout-1.0.1" = { + name = "table-layout"; + packageName = "table-layout"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz"; + sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q=="; + }; + }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; + "temp-dir-1.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; + sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + }; + }; + "tempy-0.3.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"; + sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; + }; + }; + "term-size-1.2.0" = { + name = "term-size"; + packageName = "term-size"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + }; + "text-extensions-1.9.0" = { + name = "text-extensions"; + packageName = "text-extensions"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz"; + sha512 = "wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ=="; + }; + }; + "text-table-0.2.0" = { + name = "text-table"; + packageName = "text-table"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "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"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "through2-3.0.1" = { + name = "through2"; + packageName = "through2"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; + sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + }; + }; + "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=="; + }; + }; + "tmp-0.2.1" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-readable-stream-2.1.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz"; + sha512 = "o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w=="; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "traverse-0.6.6" = { + name = "traverse"; + packageName = "traverse"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; + sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + }; + }; + "trim-newlines-2.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + }; + "trim-off-newlines-1.0.1" = { + name = "trim-off-newlines"; + packageName = "trim-off-newlines"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; + sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; + }; + }; + "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=="; + }; + }; + "tsscmp-1.0.6" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; + sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-check-0.4.0" = { + name = "type-check"; + packageName = "type-check"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; + }; + }; + "type-fest-0.10.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; + sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; + }; + }; + "type-fest-0.11.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + }; + }; + "type-fest-0.3.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; + sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; + }; + }; + "type-fest-0.6.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + }; + "type-fest-0.8.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "typescript-3.7.4" = { + name = "typescript"; + packageName = "typescript"; + version = "3.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz"; + sha512 = "A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw=="; + }; + }; + "typical-4.0.0" = { + name = "typical"; + packageName = "typical"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz"; + sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="; + }; + }; + "typical-5.2.0" = { + name = "typical"; + packageName = "typical"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz"; + sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; + }; + }; + "typical-6.0.1" = { + name = "typical"; + packageName = "typical"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-6.0.1.tgz"; + sha512 = "+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A=="; + }; + }; + "uglify-js-3.9.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; + sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + }; + }; + "unbzip2-stream-1.4.3" = { + name = "unbzip2-stream"; + packageName = "unbzip2-stream"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; + }; + }; + "union-value-1.0.1" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + }; + "universal-user-agent-4.0.1" = { + name = "universal-user-agent"; + packageName = "universal-user-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz"; + sha512 = "LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg=="; + }; + }; + "universal-user-agent-5.0.0" = { + name = "universal-user-agent"; + packageName = "universal-user-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz"; + sha512 = "B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "untildify-4.0.0" = { + name = "untildify"; + packageName = "untildify"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"; + sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="; + }; + }; + "update-check-1.5.2" = { + name = "update-check"; + packageName = "update-check"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz"; + sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ=="; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-join-4.0.1" = { + name = "url-join"; + packageName = "url-join"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz"; + sha512 = "jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "v8-compile-cache-2.1.0" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; + sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "wait-on-3.3.0" = { + name = "wait-on"; + packageName = "wait-on"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz"; + sha1 = "9940981d047a72a9544a97b8b5fca45b2170a082"; + }; + }; + "walk-back-4.0.0" = { + name = "walk-back"; + packageName = "walk-back"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/walk-back/-/walk-back-4.0.0.tgz"; + sha512 = "kudCA8PXVQfrqv2mFTG72vDBRi8BKWxGgFLwPpzHcpZnSwZk93WMwUDVcLHWNsnm+Y0AC4Vb6MUNRgaHfyV2DQ=="; + }; + }; + "weak-map-1.0.5" = { + name = "weak-map"; + packageName = "weak-map"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; + sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "widest-line-2.0.1" = { + name = "widest-line"; + packageName = "widest-line"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz"; + sha512 = "Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA=="; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "windows-release-3.3.0" = { + name = "windows-release"; + packageName = "windows-release"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz"; + sha512 = "2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ=="; + }; + }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wordwrapjs-4.0.0" = { + name = "wordwrapjs"; + packageName = "wordwrapjs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz"; + sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "wrap-ansi-3.0.1" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; + sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + }; + }; + "wrap-ansi-6.2.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-1.0.3" = { + name = "write"; + packageName = "write"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz"; + sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; + }; + }; + "ws-7.4.3" = { + name = "ws"; + packageName = "ws"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + "yaml-1.9.1" = { + name = "yaml"; + packageName = "yaml"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-1.9.1.tgz"; + sha512 = "xbWX1ayUVoW8DPM8qxOBowac4XxSTi0mFLbiokRq880ViYglN+F3nJ4Dc2GdypXpykrknKS39d8I3lzFoHv1kA=="; + }; + }; + "yaml-lint-1.2.4" = { + name = "yaml-lint"; + packageName = "yaml-lint"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-lint/-/yaml-lint-1.2.4.tgz"; + sha512 = "qpKE0szyKsE9TrlVPi+bxKxVAjl30QjNAOyOxy7noQdf/WCCYUlT4xiCRxMG48eyeBzMBtBN6PgGfaB0MJePNw=="; + }; + }; + "yargs-15.3.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-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "yargs-parser-10.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; + }; + }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; + "yauzl-2.10.0" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + }; + "ylru-1.2.1" = { + name = "ylru"; + packageName = "ylru"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz"; + sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="; + }; + }; + }; + args = { + name = "cypress-example-kitchensink"; + packageName = "cypress-example-kitchensink"; + version = "0.0.0-development"; + src = callPackage ./src.nix {}; + dependencies = [ + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" + sources."@babel/runtime-7.9.2" + sources."@bahmutov/print-env-1.2.0" + sources."@cypress/eslint-plugin-dev-5.0.0" + (sources."@cypress/listr-verbose-renderer-0.4.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."@cypress/request-2.88.5" + (sources."@cypress/xvfb-1.2.4" // { + dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@koa/cors-3.1.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@nodelib/fs.scandir-2.1.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + ]; + }) + sources."@nodelib/fs.stat-1.1.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@octokit/auth-token-2.4.0" + (sources."@octokit/endpoint-6.0.1" // { + dependencies = [ + sources."is-plain-object-3.0.0" + sources."isobject-4.0.0" + sources."universal-user-agent-5.0.0" + ]; + }) + sources."@octokit/plugin-paginate-rest-1.1.2" + sources."@octokit/plugin-request-log-1.0.0" + sources."@octokit/plugin-rest-endpoint-methods-2.4.0" + (sources."@octokit/request-5.4.2" // { + dependencies = [ + sources."@octokit/request-error-2.0.0" + sources."is-plain-object-3.0.0" + sources."isobject-4.0.0" + sources."universal-user-agent-5.0.0" + ]; + }) + sources."@octokit/request-error-1.2.1" + sources."@octokit/rest-16.43.1" + sources."@octokit/types-2.11.1" + sources."@samverschueren/stream-to-observable-0.3.1" + (sources."@semantic-release/commit-analyzer-6.3.3" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."@semantic-release/error-2.2.0" + (sources."@semantic-release/github-5.5.8" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."debug-4.1.1" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.2" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-10.0.2" + sources."ignore-5.1.4" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."ms-2.1.2" + sources."path-type-4.0.0" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + (sources."@semantic-release/npm-5.3.5" // { + dependencies = [ + sources."cross-spawn-7.0.2" + sources."execa-3.4.0" + sources."get-stream-5.1.0" + 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."p-finally-2.0.1" + sources."parse-json-5.0.0" + sources."path-key-3.1.1" + sources."read-pkg-5.2.0" + sources."registry-auth-token-4.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + (sources."@semantic-release/release-notes-generator-7.3.5" // { + dependencies = [ + sources."debug-4.1.1" + sources."get-stream-5.1.0" + sources."ms-2.1.2" + ]; + }) + sources."@sindresorhus/is-2.1.1" + sources."@szmarczak/http-timer-4.0.5" + sources."@tootallnate/once-1.1.2" + sources."@types/cacheable-request-6.0.1" + sources."@types/color-name-1.1.1" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.13.0" + sources."@types/normalize-package-data-2.4.0" + sources."@types/parse-json-4.0.0" + sources."@types/responselike-1.0.0" + sources."@types/retry-0.12.0" + sources."@types/sinonjs__fake-timers-6.0.2" + sources."@types/sizzle-2.3.3" + sources."@types/yauzl-2.9.1" + sources."@zeit/schemas-2.6.0" + sources."JSONStream-1.3.5" + sources."accepts-1.3.7" + sources."acorn-7.2.0" + sources."acorn-jsx-5.2.0" + sources."agent-base-5.1.1" + (sources."aggregate-error-3.0.1" // { + dependencies = [ + sources."indent-string-4.0.0" + ]; + }) + sources."ajv-6.5.3" + sources."ansi-align-2.0.0" + sources."ansi-escape-sequences-5.1.2" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."ansicolors-0.3.2" + sources."any-observable-0.3.0" + sources."any-promise-1.3.0" + sources."arch-2.1.1" + sources."arg-2.0.0" + sources."argparse-1.0.10" + sources."argv-formatter-1.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-back-4.0.1" + sources."array-find-index-1.0.2" + sources."array-ify-1.0.0" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-1.0.1" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-1.0.0" + sources."async-3.2.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."atob-lite-2.0.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."before-after-hook-2.1.0" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."blob-util-2.0.2" + sources."bluebird-3.7.2" + sources."bottleneck-2.19.5" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."btoa-lite-1.0.0" + sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.1" + sources."byte-size-6.2.0" + sources."bytes-3.0.0" + sources."cache-base-1.0.1" + sources."cache-content-type-1.0.1" + sources."cacheable-lookup-2.0.1" + (sources."cacheable-request-7.0.1" // { + dependencies = [ + sources."get-stream-5.2.0" + ]; + }) + sources."cachedir-2.3.0" + sources."call-me-maybe-1.0.1" + (sources."caller-callsite-2.0.0" // { + dependencies = [ + sources."callsites-2.0.0" + ]; + }) + sources."caller-path-2.0.0" + sources."callsites-3.1.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."cardinal-2.1.1" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + (sources."chdir-promise-0.4.0" // { + dependencies = [ + sources."check-more-types-2.23.0" + sources."lazy-ass-1.5.0" + sources."q-1.1.2" + ]; + }) + sources."check-more-types-2.24.0" + sources."chownr-1.1.4" + sources."ci-info-2.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."clean-stack-2.2.0" + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" + (sources."cli-table-0.3.1" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) + (sources."cli-table3-0.6.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + (sources."cli-truncate-0.2.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."cli-width-2.2.1" + (sources."clipboardy-1.2.3" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + ]; + }) + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + 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" + sources."wrap-ansi-6.2.0" + ]; + }) + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) + sources."co-4.6.0" + sources."co-body-6.1.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."colon-names-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + (sources."command-line-args-5.1.1" // { + dependencies = [ + sources."array-back-3.1.0" + sources."typical-4.0.0" + ]; + }) + (sources."command-line-usage-6.1.1" // { + dependencies = [ + sources."typical-5.2.0" + ]; + }) + sources."commander-5.1.0" + sources."common-log-format-1.0.0" + sources."common-tags-1.8.0" + sources."compare-func-1.3.2" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + sources."compression-1.7.3" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."conventional-changelog-angular-5.0.6" + (sources."conventional-changelog-writer-4.0.11" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."conventional-commits-filter-2.0.2" + sources."conventional-commits-parser-3.0.8" + sources."cookies-0.8.0" + sources."copy-descriptor-0.1.1" + sources."copy-to-2.0.1" + sources."core-js-2.6.11" + sources."core-util-is-1.0.2" + (sources."cosmiconfig-5.2.1" // { + dependencies = [ + sources."import-fresh-2.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."create-mixin-3.0.0" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + (sources."cypress-7.3.0" // { + dependencies = [ + sources."@types/node-14.17.0" + sources."ansi-styles-4.3.0" + sources."arch-2.2.0" + (sources."chalk-4.1.1" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) + sources."ci-info-3.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" + sources."debug-4.3.2" + sources."execa-4.1.0" + sources."fs-extra-9.1.0" + sources."get-stream-5.2.0" + sources."has-flag-4.0.0" + sources."is-ci-3.0.0" + sources."is-stream-2.0.0" + sources."jsonfile-6.1.0" + sources."lodash-4.17.21" + sources."ms-2.1.2" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."path-key-3.1.1" + sources."ramda-0.27.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-8.1.1" + sources."universalify-2.0.0" + sources."which-2.0.2" + ]; + }) + sources."d3-helpers-0.3.0" + sources."dashdash-1.14.1" + sources."date-fns-1.30.1" + sources."dateformat-3.0.3" + sources."dayjs-1.10.4" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.0" + sources."decompress-response-5.0.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."defer-to-connect-2.0.1" + sources."define-properties-1.1.3" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-2.0.0" + sources."deprecation-2.3.1" + sources."destroy-1.0.4" + sources."detect-indent-6.0.0" + sources."detect-newline-3.1.0" + sources."devtools-protocol-0.0.847576" + sources."diff-match-patch-1.0.4" + sources."dir-glob-2.2.2" + sources."doctrine-3.0.0" + sources."dot-prop-3.0.0" + sources."duplexer-0.1.1" + sources."duplexer2-0.1.4" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."elegant-spinner-1.0.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + (sources."env-ci-4.5.2" // { + dependencies = [ + sources."cross-spawn-7.0.2" + sources."execa-3.4.0" + sources."get-stream-5.1.0" + 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."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."error-ex-1.3.2" + sources."es-abstract-1.17.5" + sources."es-to-primitive-1.2.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.0.0" // { + dependencies = [ + sources."ajv-6.12.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.2" + sources."debug-4.1.1" + sources."fast-deep-equal-3.1.1" + sources."glob-parent-5.1.1" + sources."globals-12.4.0" + sources."has-flag-4.0.0" + sources."ms-2.1.2" + 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."type-fest-0.8.1" + sources."which-2.0.2" + ]; + }) + sources."eslint-plugin-cypress-2.8.1" + (sources."eslint-plugin-json-format-2.0.1" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."eslint-plugin-mocha-5.3.0" + sources."eslint-rule-composer-0.3.0" + 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."esprima-4.0.1" + (sources."esquery-1.3.1" // { + dependencies = [ + sources."estraverse-5.1.0" + ]; + }) + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + (sources."event-stream-3.3.4" // { + dependencies = [ + sources."split-0.3.3" + ]; + }) + sources."eventemitter2-6.4.4" + (sources."execa-2.0.5" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."is-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."npm-run-path-3.1.0" + sources."onetime-5.1.0" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + ]; + }) + (sources."executable-4.1.1" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."exit-hook-1.1.1" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.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" // { + dependencies = [ + sources."tmp-0.0.33" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + sources."extract-zip-1.7.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-glob-2.2.7" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + (sources."fast-url-parser-1.1.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."fastq-1.7.0" + sources."fd-slicer-1.1.0" + sources."figures-1.7.0" + sources."file-entry-cache-5.0.1" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."find-replace-3.0.0" // { + dependencies = [ + sources."array-back-3.1.0" + ]; + }) + sources."find-up-3.0.0" + sources."find-versions-3.2.0" + (sources."flat-cache-2.0.1" // { + dependencies = [ + sources."rimraf-2.6.3" + ]; + }) + sources."flatted-2.0.2" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from-0.1.7" + sources."from2-2.3.0" + sources."fs-constants-1.0.0" + sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-2.0.5" + sources."get-stdin-6.0.0" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."getos-3.2.1" + sources."getpass-0.1.7" + (sources."ggit-1.15.1" // { + dependencies = [ + sources."bluebird-3.5.0" + sources."colors-1.1.2" + sources."commander-2.9.0" + sources."debug-2.6.3" + sources."glob-7.1.1" + sources."lodash-3.10.1" + sources."moment-2.18.1" + sources."ms-0.7.2" + sources."q-2.0.3" + sources."ramda-0.9.1" + ]; + }) + sources."git-hooks-list-1.0.3" + (sources."git-log-parser-1.2.0" // { + dependencies = [ + sources."split2-1.0.0" + sources."through2-2.0.5" + ]; + }) + 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-3.0.0" // { + dependencies = [ + sources."ini-2.0.0" + ]; + }) + sources."globals-11.12.0" + (sources."globby-9.1.0" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + (sources."got-10.7.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."type-fest-0.10.0" + ]; + }) + sources."graceful-fs-4.2.3" + sources."graceful-readlink-1.0.1" + (sources."handlebars-4.7.6" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."har-schema-2.0.0" + (sources."har-validator-5.1.3" // { + dependencies = [ + sources."ajv-6.12.2" + sources."fast-deep-equal-3.1.1" + ]; + }) + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hook-std-2.0.0" + sources."hosted-git-info-2.8.8" + (sources."http-assert-1.4.1" // { + dependencies = [ + sources."depd-1.1.2" + sources."http-errors-1.7.3" + ]; + }) + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.8.0" // { + dependencies = [ + sources."depd-1.1.2" + sources."setprototypeof-1.2.0" + ]; + }) + (sources."http-proxy-agent-3.0.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."http-signature-1.2.0" + (sources."https-proxy-agent-4.0.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."human-signals-1.1.1" + (sources."husky-1.3.1" // { + dependencies = [ + sources."execa-1.0.0" + sources."get-stream-4.1.0" + sources."read-pkg-4.0.1" + ]; + }) + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."ignore-4.0.6" + sources."import-fresh-3.2.1" + (sources."import-from-3.0.0" // { + dependencies = [ + sources."resolve-from-5.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."inflation-2.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-7.1.0" // { + 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."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + 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."restore-cursor-3.1.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" + sources."type-fest-0.11.0" + ]; + }) + sources."interpret-1.2.0" + sources."into-stream-5.1.1" + sources."invert-kv-1.0.0" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" + sources."is-ci-2.0.0" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-date-object-1.0.2" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."is-directory-0.3.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-generator-function-1.0.8" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.4.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-1.0.1" + sources."is-observable-1.1.0" + sources."is-path-inside-3.0.3" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-promise-2.2.2" + sources."is-regex-1.0.5" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-text-path-1.0.1" + sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" + sources."is-windows-1.0.2" + 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."issue-parser-5.0.0" + sources."java-properties-1.0.2" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.1" + (sources."json-fixer-1.4.1" // { + 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."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."jsonfile-4.0.0" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."keygrip-1.1.0" + sources."keyv-4.0.3" + sources."kind-of-6.0.3" + (sources."koa-2.13.1" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."koa-bodyparser-4.3.0" + sources."koa-compose-4.1.0" + sources."koa-compress-3.1.0" + sources."koa-conditional-get-2.0.0" + (sources."koa-convert-1.2.0" // { + dependencies = [ + sources."koa-compose-3.2.1" + ]; + }) + sources."koa-etag-3.0.0" + sources."koa-is-json-1.0.0" + sources."koa-json-2.0.2" + sources."koa-morgan-1.0.1" + sources."koa-range-0.3.0" + (sources."koa-route-3.2.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."path-to-regexp-1.8.0" + ]; + }) + (sources."koa-send-5.0.1" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + ]; + }) + (sources."koa-static-5.0.0" // { + dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" + ]; + }) + sources."lazy-ass-1.6.0" + sources."lcid-1.0.0" + (sources."leprechaun-0.0.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."log-symbols-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."levn-0.4.1" + (sources."line-column-1.0.2" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."lines-and-columns-1.1.6" + sources."listr-0.14.3" + sources."listr-silent-renderer-1.1.1" + (sources."listr-update-renderer-0.5.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."log-symbols-1.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."listr-verbose-renderer-0.5.0" // { + dependencies = [ + sources."cli-cursor-2.1.0" + sources."figures-2.0.0" + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + ]; + }) + sources."load-json-file-4.0.0" + sources."load-module-3.0.0" + sources."local-web-server-4.2.1" + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."lodash.assignwith-4.2.0" + sources."lodash.camelcase-4.3.0" + sources."lodash.capitalize-4.2.1" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.get-4.4.2" + sources."lodash.ismatch-4.4.0" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" + sources."lodash.once-4.1.1" + sources."lodash.set-4.3.2" + sources."lodash.snakecase-4.1.1" + sources."lodash.throttle-4.1.1" + sources."lodash.toarray-4.4.0" + sources."lodash.uniq-4.5.0" + sources."lodash.uniqby-4.7.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."log-update-2.3.0" // { + dependencies = [ + sources."cli-cursor-2.1.0" + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + ]; + }) + sources."loud-rejection-1.6.0" + sources."lowercase-keys-2.0.0" + sources."lru-cache-4.1.5" + sources."lws-3.1.0" + sources."lws-basic-auth-2.0.0" + (sources."lws-blacklist-3.0.0" // { + dependencies = [ + sources."path-to-regexp-6.2.0" + ]; + }) + sources."lws-body-parser-2.0.0" + sources."lws-compress-2.0.0" + sources."lws-conditional-get-2.0.0" + sources."lws-cors-3.0.0" + sources."lws-index-2.0.0" + sources."lws-json-2.0.0" + sources."lws-log-2.0.0" + sources."lws-mime-2.0.0" + sources."lws-range-3.0.0" + sources."lws-request-monitor-2.0.0" + (sources."lws-rewrite-3.1.1" // { + dependencies = [ + sources."agent-base-6.0.2" + sources."debug-4.3.1" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" + sources."ms-2.1.2" + sources."path-to-regexp-6.2.0" + ]; + }) + sources."lws-spa-3.0.0" + sources."lws-static-2.0.0" + sources."macos-release-2.3.0" + sources."map-cache-0.2.2" + sources."map-obj-2.0.0" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + sources."marked-0.7.0" + sources."marked-terminal-3.3.0" + sources."media-typer-0.3.0" + sources."memorystream-0.3.1" + (sources."meow-5.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."read-pkg-up-3.0.0" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.3.0" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-2.4.4" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minimist-options-3.0.2" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" + sources."modify-values-1.0.1" + sources."morgan-1.10.0" + sources."ms-2.0.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + (sources."nconf-0.10.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."async-1.5.2" + sources."camelcase-2.1.1" + sources."cliui-3.2.0" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.1" + sources."yargs-3.32.0" + ]; + }) + sources."negotiator-0.6.2" + sources."neo-async-2.6.1" + sources."nerf-dart-1.0.0" + (sources."netlify-plugin-cypress-2.0.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.3" + sources."ramda-0.27.1" + ]; + }) + sources."nice-try-1.0.5" + sources."node-emoji-1.10.0" + sources."node-fetch-2.6.0" + sources."node-version-matches-2.0.1" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-url-4.5.0" + sources."npm-6.14.4" + sources."npm-run-all-4.1.5" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.7.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.pick-1.3.0" + sources."octokit-pagination-methods-1.1.0" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."only-0.0.2" + sources."open-7.4.2" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."minimist-0.0.10" + sources."wordwrap-0.0.3" + ]; + }) + sources."optionator-0.9.1" + sources."os-locale-1.4.0" + sources."os-name-3.1.0" + sources."os-tmpdir-1.0.2" + sources."ospath-1.2.2" + sources."p-cancelable-2.0.0" + sources."p-event-4.2.0" + sources."p-filter-2.1.0" + sources."p-finally-1.0.0" + sources."p-is-promise-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-reduce-2.1.0" + sources."p-retry-4.2.0" + sources."p-timeout-3.2.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-4.0.0" + 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-parse-1.0.6" + sources."path-to-regexp-2.2.1" + sources."path-type-3.0.0" + sources."pause-stream-0.0.11" + sources."pegjs-0.10.0" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."picomatch-2.2.2" + sources."pidtree-0.3.1" + sources."pify-3.0.0" + (sources."pkg-conf-2.1.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) + sources."pkg-dir-3.0.0" + sources."please-upgrade-node-3.2.0" + sources."pluralize-5.0.0" + sources."pop-iterate-1.0.1" + sources."posix-character-classes-0.1.1" + sources."prelude-ls-1.2.1" + sources."pretty-bytes-5.6.0" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."proxy-from-env-1.1.0" + sources."ps-tree-1.2.0" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + (sources."puppeteer-7.1.0" // { + dependencies = [ + sources."agent-base-6.0.2" + sources."debug-4.3.1" + sources."extract-zip-2.0.1" + sources."find-up-4.1.0" + sources."get-stream-5.2.0" + sources."https-proxy-agent-5.0.0" + sources."locate-path-5.0.0" + sources."ms-2.1.2" + sources."node-fetch-2.6.1" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + ]; + }) + sources."q-1.5.1" + sources."qrcode-terminal-0.12.0" + sources."qs-6.5.2" + sources."querystring-0.2.0" + sources."quick-lru-1.1.0" + sources."quote-0.4.0" + sources."ramda-0.26.1" + sources."range-parser-1.2.0" + (sources."raw-body-2.4.1" // { + dependencies = [ + sources."bytes-3.1.0" + sources."depd-1.1.2" + sources."http-errors-1.7.3" + ]; + }) + sources."rc-1.2.8" + sources."read-pkg-3.0.0" + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + 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."path-exists-4.0.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-2.3.7" + sources."rechoir-0.6.2" + sources."redent-2.0.0" + sources."redeyed-2.1.1" + sources."reduce-flatten-3.0.0" + sources."regenerator-runtime-0.13.5" + sources."regex-not-1.0.2" + sources."regexpp-3.1.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."request-progress-3.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.16.1" + sources."resolve-from-4.0.0" + (sources."resolve-path-1.4.0" // { + dependencies = [ + sources."depd-1.1.2" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."resolve-url-0.2.1" + sources."responselike-2.0.0" + sources."restore-cursor-1.0.1" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."run-node-1.0.0" + sources."run-parallel-1.1.9" + sources."rx-4.1.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."secure-keys-1.0.0" + (sources."semantic-release-15.13.32" // { + dependencies = [ + sources."cosmiconfig-6.0.0" + sources."cross-spawn-7.0.2" + sources."debug-4.1.1" + sources."execa-3.4.0" + sources."figures-3.2.0" + sources."get-stream-5.1.0" + sources."hosted-git-info-3.0.4" + sources."is-stream-2.0.0" + sources."lru-cache-5.1.1" + sources."mimic-fn-2.1.0" + sources."ms-2.1.2" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.0" + sources."p-finally-2.0.1" + sources."p-locate-4.1.0" + sources."parse-json-5.0.0" + sources."path-key-3.1.1" + sources."path-type-4.0.0" + sources."resolve-from-5.0.0" + sources."semver-6.3.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + sources."yallist-3.1.1" + ]; + }) + sources."semver-6.3.0" + sources."semver-compare-1.0.0" + sources."semver-regex-2.0.0" + (sources."serve-11.3.0" // { + dependencies = [ + sources."chalk-2.4.1" + ]; + }) + (sources."serve-handler-6.1.2" // { + dependencies = [ + sources."mime-db-1.33.0" + sources."mime-types-2.1.18" + ]; + }) + (sources."serve-index-75lb-2.0.1" // { + dependencies = [ + sources."depd-1.1.2" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" + sources."shelljs-0.8.4" + sources."signal-exit-3.0.3" + (sources."signale-1.4.0" // { + dependencies = [ + sources."figures-2.0.0" + ]; + }) + sources."slash-2.0.0" + sources."slice-ansi-0.0.4" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."sort-object-keys-1.1.3" + (sources."sort-package-json-1.42.2" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.2" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-10.0.0" + sources."ignore-5.1.4" + sources."is-number-7.0.0" + sources."is-plain-obj-2.1.0" + sources."micromatch-4.0.2" + sources."path-type-4.0.0" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."spawn-error-forwarder-1.0.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + sources."split-1.0.1" + sources."split-string-3.1.0" + (sources."split2-2.2.0" // { + dependencies = [ + sources."through2-2.0.5" + ]; + }) + sources."spots-0.4.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + (sources."start-server-and-test-1.10.6" // { + dependencies = [ + sources."bluebird-3.7.1" + sources."cross-spawn-7.0.2" + sources."debug-4.1.1" + sources."execa-2.1.0" + sources."get-stream-5.1.0" + sources."is-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."ms-2.1.2" + sources."npm-run-path-3.1.0" + sources."onetime-5.1.0" + 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."which-2.0.2" + ]; + }) + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."statuses-1.5.0" + sources."stop-build-1.1.0" + sources."stream-combiner-0.0.4" + sources."stream-combiner2-1.1.1" + sources."stream-log-stats-3.0.2" + sources."stream-slice-0.1.2" + sources."stream-via-1.0.4" + sources."streaming-json-stringify-3.1.0" + sources."string-width-2.1.1" + sources."string.prototype.padend-3.1.0" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-1.1.1" + sources."strip-ansi-4.0.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-1.0.1" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + sources."symbol-observable-1.2.0" + (sources."table-5.4.6" // { + dependencies = [ + sources."ajv-6.12.2" + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."fast-deep-equal-3.1.1" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + (sources."table-layout-1.0.1" // { + dependencies = [ + sources."typical-5.2.0" + ]; + }) + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."temp-dir-1.0.0" + (sources."tempy-0.3.0" // { + dependencies = [ + sources."type-fest-0.3.1" + ]; + }) + (sources."term-size-1.2.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + ]; + }) + sources."text-extensions-1.9.0" + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."throttleit-1.0.0" + sources."through-2.3.8" + sources."through2-3.0.1" + sources."tmp-0.2.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-2.1.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."tough-cookie-2.5.0" + sources."traverse-0.6.6" + sources."trim-newlines-2.0.0" + sources."trim-off-newlines-1.0.1" + sources."tslib-1.11.1" + sources."tsscmp-1.0.6" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typescript-3.7.4" + sources."typical-6.0.1" + (sources."uglify-js-3.9.1" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + sources."unbzip2-stream-1.4.3" + sources."union-value-1.0.1" + sources."unique-string-1.0.0" + sources."universal-user-agent-4.0.1" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."untildify-4.0.0" + sources."update-check-1.5.2" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-4.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.1.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."wait-on-3.3.0" + sources."walk-back-4.0.0" + sources."weak-map-1.0.5" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."widest-line-2.0.1" + sources."window-size-0.1.4" + (sources."windows-release-3.3.0" // { + dependencies = [ + sources."execa-1.0.0" + sources."get-stream-4.1.0" + ]; + }) + sources."word-wrap-1.2.3" + sources."wordwrap-1.0.0" + (sources."wordwrapjs-4.0.0" // { + dependencies = [ + sources."reduce-flatten-2.0.0" + sources."typical-5.2.0" + ]; + }) + sources."wrap-ansi-3.0.1" + sources."wrappy-1.0.2" + sources."write-1.0.3" + sources."ws-7.4.3" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-2.1.2" + sources."yaml-1.9.1" + sources."yaml-lint-1.2.4" + (sources."yargs-15.3.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."camelcase-5.3.1" + sources."emoji-regex-8.0.0" + sources."find-up-4.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-10.1.0" + sources."yauzl-2.10.0" + sources."ylru-1.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "This is an example app used to showcase Cypress.io testing. For a full reference of our documentation, go to https://docs.cypress.io"; + homepage = "https://github.com/cypress-io/cypress-example-kitchensink#readme"; + license = "MIT"; + }; + production = false; + bypassCache = true; + reconstructLock = false; + }; +in +{ + args = args; + sources = sources; + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; + nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { + src = stdenv.mkDerivation { + name = args.name + "-package-json"; + src = (ignore: src: src) [ + "*" + "!package.json" + "!package-lock.json" + ] args.src; + dontBuild = true; + installPhase = "mkdir -p $out; cp -r ./* $out;"; + }; + }); +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix new file mode 100755 index 00000000000..86061211d7b --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell ./regen-nix.nix +#!nix-shell -i bash + +node2nix \ + --nodejs-12 \ + --input $src/package.json \ + --lock $src/package-lock.json \ + --composition cypress-example-kitchensink.nix \ + --development \ + ; + +# node2nix produces opinionated expressions that work for in-repo packaging +# but aren't ideal for Nixpkgs: +sed -i cypress-example-kitchensink.nix \ + -e 's^fetchgit^fetchgit callPackage^' +sed -i node-packages.nix \ + -e 's^fetchgit, ^fetchgit, callPackage, ^' \ + -e 's^src = .*/nix/store/.*-source^src = callPackage ./src.nix {}^' \ + -e 's^nix-gitignore.gitignoreSourcePure^(ignore: src: src)^' \ + ; diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix new file mode 100644 index 00000000000..f7276c5c2ec --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/regen-nix.nix @@ -0,0 +1,8 @@ +{ pkgs ? import ../../../../.. { config = { }; overlays = [ ]; } }: + +pkgs.mkShell { + nativeBuildInputs = [ + pkgs.nodePackages.node2nix + ]; + src = pkgs.callPackage ./src.nix { }; +} diff --git a/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix b/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix new file mode 100644 index 00000000000..8f9999a704f --- /dev/null +++ b/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix @@ -0,0 +1,6 @@ +{ fetchFromGitHub }: fetchFromGitHub { + owner = "cypress-io"; + repo = "cypress-example-kitchensink"; + rev = "1572887a2003c2f35ff46d14f5f1cdfef975c9be"; + sha256 = "sha256-A7d95b9V707iOzlIg+3nItPPB8HNVVOjPhGqa8MXRPE="; +} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 0b61aa23086..811a63b0cef 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,19 @@ -{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsa-lib, udev, unzip, wrapGAppsHook, mesa }: +{ alsa-lib +, autoPatchelfHook +, callPackage +, fetchzip +, gnome2 +, gtk2 +, gtk3 +, lib +, mesa +, nss +, stdenv +, udev +, unzip +, wrapGAppsHook +, xorg +}: stdenv.mkDerivation rec { pname = "cypress"; @@ -9,17 +24,22 @@ stdenv.mkDerivation rec { sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; }; - passthru.updateScript = ./update.sh; - # don't remove runtime deps dontPatchELF = true; nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook unzip ]; buildInputs = with xorg; [ - libXScrnSaver libXdamage libXtst libxshmfence + libXScrnSaver + libXdamage + libXtst + libxshmfence ] ++ [ - nss gtk2 alsa-lib gnome2.GConf gtk3 + nss + gtk2 + alsa-lib + gnome2.GConf + gtk3 mesa # for libgbm ]; @@ -41,11 +61,19 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = ./update.sh; + + tests = { + example = callPackage ./cypress-example-kitchensink { }; + }; + }; + meta = with lib; { description = "Fast, easy and reliable testing for anything that runs in a browser"; homepage = "https://www.cypress.io"; license = licenses.mit; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ tweber mmahut ]; }; } diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 46ac84cd125..f6cd67d70bc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.5"; + version = "1.12.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DrmdIWaWkOQeghhsnowkdgPA+z4+L2MTs7DNyeqDi5w="; + sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g="; }; - cargoSha256 = "sha256-E0qcy+/o8q9dv3KJjNkI+VNa5MBWzwla2Dz8niwvPCw="; + cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 6ae0de15c77..a85d2bf76f2 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.3"; + version = "0.25.3"; shas = { - x86_64-linux = "sha256-RS1fUuTm6zhln67ank6Sit9nhGyKij1UsJ77ezffCh8="; - aarch64-linux = "sha256-E7SSFYODO8diPmEvpJyzAcltrh7YUXhWlqsRytFRmtA="; - x86_64-darwin = "sha256-29XTC7RoUDNJq46WkLCQT1vCuv4dzBrp8no6vVCsQ2g="; - aarch64-darwin = "sha256-UZHhKUjWQGklH26z2Kc2J7VwlV83LWl5n3YZt5ryKrY="; + x86_64-linux = "sha256-Z3lEJT3QVhP8PoDiM6Fw0sm5rXWvasBqASBO5tZA5zM="; + aarch64-linux = "sha256-pbcd1zV7IIEqCIp8vsRiO0KBGrOv52SvMZ4gthxuN/I="; + x86_64-darwin = "sha256-BwYdgd1kK8EQFfDc9RgtNvwvx7agt9hYNVmBGwHoqz0="; + aarch64-darwin = "sha256-/RHeNuR7VjhfwdjZXWMMX3UnweAjJblSCUq9eIwGvWc="; }; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 350abed7ec7..766df734a4a 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.2"; - sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj"; + version = "16.5.0"; + sha256 = "16dapj5pm2y1m3ldrjjlz8rq9axk85nn316iz02nk6qjs66y6drz"; } diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix index ca7c8e16e3c..ede151307d5 100644 --- a/pkgs/games/0ad/wrapper.nix +++ b/pkgs/games/0ad/wrapper.nix @@ -6,7 +6,7 @@ buildEnv { name = "zeroad-${zeroad-unwrapped.version}"; inherit (zeroad-unwrapped) meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ zeroad-unwrapped zeroad-data ]; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 3e96351acbb..7fd3dc61dd4 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -40,7 +40,7 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. - latestVersion = "0.47.04"; + latestVersion = "0.47.05"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 4bfb69355a7..80fa1de18e4 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -71,6 +71,13 @@ let xmlRev = "036b662a1bbc96b4911f3cbe74dfa1243b6459bc"; prerelease = false; }; + "0.47.05" = { + dfHackRelease = "0.47.05-r1"; + sha256 = "sha256-B0iv7fpIcnaO8sx9wPqI7/WuyLK15p8UYlYIcF5F5bw="; + xmlRev = "11c379ffd31255f2a1415d98106114a46245e1c3"; + prerelease = false; + }; + }; release = diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json index f5f1f389904..522cccdcda4 100644 --- a/pkgs/games/dwarf-fortress/game.json +++ b/pkgs/games/dwarf-fortress/game.json @@ -121,5 +121,19 @@ "legacy_s": "19ai7lvxx0y3iha9qrbl5krric547rzs6vm4ibk8x61vv97jrbd8", "legacy32": "0lli6s1g7yj3p3h26ajgq3h619n88qn6s7amyz6z8w7hyzfi7wij", "legacy32_s": "1wzxbzgln9pmsk2nchrl94d2yd09xdgynmjl4qwcaqzkrnf3sfqc" + }, + "0.47.05": { + "linux": "18zwmz2nsgwjxbr2yd9jcrgw6l5b481hh1848cgn5nfpnzdscx5c", + "linux32": "1jbav7ghsjsxd6cdp6f2x5qn83zc8707dqan5sp73fp6mbj2jasl", + "osx": "092z1vhc5sbdc5irggdz5ai7rxifmg4yhy33aicpsjcnvcmajydw", + "osx32": "0lpbwfiagp0zp280aw3fmj8938w5fc5r9gibzk2h86jy63ps29ww", + "win": "0bbk7j3d4h2wn9hmbsbbbbr0ajf3ddlprxfaajfbnbiyv72cpn9s", + "win_s": "0nl7c9dpfx7jjpy7y52z8h3kiy4cpax1m58apbcfyy95an4jz8s4", + "win32": "08ka1lklly82h4mr770y9p0a21x9dx6jqvjgxdsxj5979f26il1v", + "win32_s": "06w844zxzx3lfykibgkk4gbg4xymnqraj1ikv4mzlv31l727a1x4", + "legacy": "042a0gbad3cp5dwhnrzg3vr9w48b8ybqgxgw5i9rk4c1i0gjjpw2", + "legacy_s": "1rb7h8lzlsjs08rvhhl3nwbrpj54zijijp4y0qdp4vyzsig6nisk", + "legacy32": "0ayw09x9smihh8qp5pdvr6vvhwkvcqz36h3lh4g1b5kzxj7g9cyf", + "legacy32_s": "10gfxlysfs9gyi1mv52idp5xk45g9h517g2jq4a8cqp2j7594v9c" } } diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index d73b111919e..e4b7349a690 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -52,7 +52,8 @@ let in stdenv.mkDerivation { - name = "dwarf-fortress-${dfVersion}"; + pname = "dwarf-fortress"; + version = dfVersion; src = fetchurl { url = "${homepage}df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2"; diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json index 8b0b9127d5b..1b2449addf4 100644 --- a/pkgs/games/dwarf-fortress/themes/themes.json +++ b/pkgs/games/dwarf-fortress/themes/themes.json @@ -1,8 +1,8 @@ [ { "name": "afro-graphics", - "version": "47.04", - "sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0" + "version": "47.05", + "sha256": "0gqrxb4bbx1h93xjz4ygd7yp8g5barj2zc6y7xvr94ww8b9a2r28" }, { "name": "autoreiv", @@ -21,13 +21,13 @@ }, { "name": "gemset", - "version": "47.04", - "sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92" + "version": "47.05", + "sha256": "1ivsbj71w3zwxnaz0405xhqhn4yzdfziijc0s0vmbmcphhhqnjaj" }, { "name": "ironhand", - "version": "47.04", - "sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2" + "version": "47.05", + "sha256": "003yrwishkzf6nvr6xlldbnd3x7rf5ds7l91mc0npdq1lcl0br9w" }, { "name": "jolly-bastion", @@ -36,33 +36,33 @@ }, { "name": "mayday", - "version": "47.04a", - "sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w" + "version": "47.05", + "sha256": "17sdvr9a98xx5r2nrr3m4jlddvlb4h6qlch8r23g9g4mj0hsifnj" }, { "name": "meph", - "version": "47.04_v5.5.0_V1.1.2", - "sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50" + "version": "47.05_v5.5.1-V", + "sha256": "1kiqxiqw686dii5x7zav2nsw15csg0grv4h8hrb764rl4fw6x9nl" }, { "name": "obsidian", - "version": "47.04a", - "sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms" + "version": "47.05", + "sha256": "1dkwdwm52fsj4gqqqr5vppbsk8a4kd3i7d3qawawgl0qn6q139xs" }, { "name": "phoebus", - "version": "47.04a", - "sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw" + "version": "47.05", + "sha256": "18pn3dqyk9hp82gva92c6y3vk52s366rrx74rdnvahswdr5dmq4d" }, { "name": "rally-ho", - "version": "47.04", - "sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0" + "version": "47.05", + "sha256": "1h3jqq0yq2rbzbl70sq85lgdpwswczpay16kqfwq1n8zdisl4gqn" }, { "name": "spacefox", - "version": "47.04", - "sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj" + "version": "47.05a", + "sha256": "1y1rbsxr1m0mb2k02q6gh24c4nyqc9lw98dvfckp2bzc5f9cx3ks" }, { "name": "taffer", @@ -76,8 +76,8 @@ }, { "name": "vettlingr", - "version": "1.4a", - "sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj" + "version": "47.05", + "sha256": "0s1vy3ssp1hk8f6wlkz09xy5v747dpbsgw5vi6i1mq3lnlcy68vq" }, { "name": "wanderlust", diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index e6c82e32f0d..7882cf06a07 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -50,6 +50,12 @@ let sha256 = "092dgp8fh1j4nqr9wbzn89ib1nhscclr8m91lfxsvg0mgn7j8xlv"; prerelease = true; }; + "0.47.05" = { + twbtRelease = "6.xx"; + dfhackRelease = "0.47.05-beta1"; + sha256 = "sha256-Y6G0qBMHvotp/oyiqANlzXZVklL270dhskd135PnE9Q="; + prerelease = true; + }; }; release = diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 7e96b284044..5b25cf4ff40 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -12,6 +12,7 @@ , ncurses , glib , gtk2 +, gtk3 , libsndfile , zlib , dfVersion @@ -58,6 +59,10 @@ let unfuckRelease = "0.47.04"; sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9"; }; + "0.47.05" = { + unfuckRelease = "0.47.04"; + sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9"; + }; }; release = @@ -90,11 +95,16 @@ stdenv.mkDerivation { glew openalSoft ncurses - gtk2 libsndfile zlib libGL - ]; + ] + # switched to gtk3 in 0.47.05 + ++ (if lib.versionOlder release.unfuckRelease "0.47.05" then [ + gtk2 + ] else [ + gtk3 + ]); # Don't strip unused symbols; dfhack hooks into some of them. dontStrip = true; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b230d94cfa5..98c58191f16 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.35.tar.xz", + "name": "factorio_alpha_x64-1.1.36.tar.xz", "needsAuth": true, - "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", + "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", + "version": "1.1.36" }, "stable": { "name": "factorio_alpha_x64-1.1.35.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.35.tar.xz", + "name": "factorio_headless_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", + "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/headless/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/headless/linux64", + "version": "1.1.36" }, "stable": { "name": "factorio_headless_x64-1.1.35.tar.xz", diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 3ecade9b97e..8cd70aed614 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,14 +1,14 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.12rc1"; + name = "flare-1.12rc2"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) (callPackage ./game.nix {}) ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' mkdir -p $out/bin makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare" diff --git a/pkgs/games/flare/desktop.patch b/pkgs/games/flare/desktop.patch new file mode 100644 index 00000000000..1ef3c21d010 --- /dev/null +++ b/pkgs/games/flare/desktop.patch @@ -0,0 +1,15 @@ +diff --git a/distribution/flare.desktop.in b/distribution/flare.desktop.in +index c740e2a6..eef91a89 100644 +--- a/distribution/flare.desktop.in ++++ b/distribution/flare.desktop.in +@@ -14,8 +14,8 @@ Comment[fr]=Un jeu de rôle d'action monojoueur en 2D isométrique + Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións. + Comment[ru]=Изометрический ролевой боевик для одного игрока + Comment[uk]=Ізометричний рольовий екшн (Action/RPG) для одного гравця +-TryExec=@FLARE_EXECUTABLE_PATH@ +-Exec=@FLARE_EXECUTABLE_PATH@ ++TryExec=flare ++Exec=flare + Categories=Game;RolePlaying; + Icon=flare + Terminal=false diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index 9104195febc..1f1f35a3762 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.12rc1"; + version = "1.12rc2"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p"; + sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq"; }; + patches = [ ./desktop.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ] ++ lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 7eae29f84d1..10e27b4d39c 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.12rc1"; + version = "1.12rc2"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc"; + sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix index 3aa459777ea..8af3dfe31f6 100644 --- a/pkgs/games/iortcw/default.nix +++ b/pkgs/games/iortcw/default.nix @@ -12,7 +12,7 @@ in buildEnv { pathsToLink = [ "/opt" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # so we can launch sp from mp game and vice versa postBuild = '' diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index b6f66b30769..139baece4a6 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,24 +1,24 @@ -{ fetchFromGitHub, fetchpatch, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, qtmultimedia, qttools, yajl, libzip, hunspell -, boost, libGLU, lua, cmake, which, }: +{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell +, boost, libGLU, lua, cmake, which, pkg-config, }: let luaEnv = lua.withPackages(ps: with ps; [ luazip luafilesystem lrexlib-pcre luasql-sqlite3 lua-yajl luautf8 ]); in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.9.1"; + version = "4.12.0"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "0i022qcmlq4xwl2yh4xd5qdc0ag52605qmqqz6bim0h8f3dp8cx1"; + sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp"; }; - nativeBuildInputs = [ cmake wrapQtAppsHook git qttools which ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ]; buildInputs = [ - pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libzip libGLU yajl boost hunspell + pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell ]; WITH_FONTS = "NO"; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4209311154d..d4ae6046f1c 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.703.0"; + version = "2021.707.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "52wGjNVCh1dyPgDfKnsfPcCI1Jh1R70zRUs/jNyaBI8="; + sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index f6da6d5c140..4684d79d95c 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -781,13 +781,13 @@ }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; - version = "2021.614.0"; - sha256 = "0b3b72lvjz8lfh0n5rilmf91j0phgmy1jjnw0v6l7qral72lhd4y"; + version = "2021.706.0"; + sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.702.0"; - sha256 = "16lx73gikjl2bmndqh3vizfn1whjvvq2iwy8sll3yqwb20bg7kaa"; + version = "2021.707.0"; + sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -796,8 +796,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2021.701.0"; - sha256 = "0ii5ki983vxjq0iq28nzb9xqkmg8iscwj77hcnpf14cj7xiyg454"; + version = "2021.706.0"; + sha256 = "1yacqy8h93vph3faf4y0iwhlnlmbny3zj57cm2bh04z2gk0l17am"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 72612394fe2..6740b51cfd9 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.16.5"; - buildNum = "771"; + mcVersion = "1.17.1"; + buildNum = "97"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l"; + sha256 = "sha256:0d7q6v5w872phcgkha7j5sxniqq9wqbh1jxdvyvy6d2jl74g1gzw"; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a0557eed9b1..b2c303caa54 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -150,6 +150,7 @@ in buildFHSUserEnv rec { # dependencies for mesa drivers, needed inside pressure-vessel mesa.drivers + mesa.llvmPackages.llvm.lib vulkan-loader expat wayland @@ -157,7 +158,6 @@ in buildFHSUserEnv rec { xorg.libXdamage xorg.libxshmfence xorg.libXxf86vm - llvm_11.lib libelf ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index ab2c19249aa..a986e1baa2c 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210527.0"; + version = "0.20210630.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "1880d1byn265w0vy5p98d8w8virnbywj707ydybj7rixhid2gzdc"; + sha256 = "sha256-vwSgk3hEaI/RO9uvehAx3+ZBynpqjwGDzuyeyGCnu18="; name = "scout-runtime-${version}.tar.gz"; }; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 703578c2d4e..1dec8da537a 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -1,28 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, scons, pkg-config, SDL2, lua, fftwFloat, - zlib, bzip2, curl, darwin }: +{ lib, stdenv, fetchFromGitHub, meson, luajit, ninja, pkg-config +, python3, SDL2, lua, fftwFloat, zlib, bzip2, curl, darwin }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "95.0"; + version = "96.0.348"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "18rp2g1mj0gklra06wm9dm57h73hmm301npndh0y8ap192i5s8sa"; + sha256 = "sha256-PAnjNeqGJPW7TeoIsaOnuOb1loyKs8pjBseKoD0CvQU="; }; - nativeBuildInputs = [ scons pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin - [ darwin.apple_sdk.frameworks.Cocoa ]; - - buildInputs = [ SDL2 lua fftwFloat zlib bzip2 curl ]; + buildInputs = [ luajit SDL2 lua fftwFloat zlib bzip2 curl ]; installPhase = '' - install -Dm 755 build/powder* "$out/bin/powder" + install -Dm 755 powder $out/bin/powder ''; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/games/uchess/default.nix b/pkgs/games/uchess/default.nix index bc2524466cc..cafd7cf5769 100644 --- a/pkgs/games/uchess/default.nix +++ b/pkgs/games/uchess/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { # package does not contain any tests as of v0.2.1 doCheck = false; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin ''; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 72a5240dfc6..f2e61d18ee2 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.11"; + version = "6.12"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "02v725qjsibiv6ad6hxsc6199dvlmnp7983286a4k8rygqnvqln9"; + sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv"; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,10 +65,11 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0gbci8fjvl1bdz7fj4bh25mqrgi1i04q5na2ckv9hj9nh9x7crbm"; + sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp"; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + # Replace back on next release: rev = "v${version}"; + rev = "v6.12.1"; disabledPatchsets = [ ]; }; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 2b645817a7e..1bac8b0fe0c 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "flashfocus"; - version = "2.2.2"; + version = "2.2.3"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; + sha256 = "0cn44hryvz2wl7xklaslxsb3l2i3f8jkgmml0n9v2ks22j5l4r4h"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 3d7e9e48eb3..71f3e13fc90 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -401,6 +401,13 @@ in { ubootRockPro64 = buildUBoot { extraMakeFlags = [ "all" "u-boot.itb" ]; + extraPatches = [ + # https://patchwork.ozlabs.org/project/uboot/list/?series=237654&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/237654/mbox/"; + sha256 = "0aiw9zk8w4msd3v8nndhkspjify0yq6a5f0zdy6mhzs0ilq896c3"; + }) + ]; defconfig = "rockpro64-rk3399_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31="${armTrustedFirmwareRK3399}/bl31.elf"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 470faa66b93..9eb3b04dd7f 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-09"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "2a5a7baffc3b5530a2f167d241b87a3f09ed12e6"; - sha256 = "1dp69c3a1dhiz43cf4p34n2mja44dbfhxxn9y1p18ijvqmsbm2qm"; + rev = "d8f4e8b7081724c0b9ff2491dd68409b3da69b0f"; + sha256 = "0rwj9rhkzg004jv9q8wr86l9xak4wqf7l5skq1nf8k0xis9aw6d3"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -221,12 +221,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-07-08"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "e40bd7e5d08818380b244916c9dbd6bc9c5657a2"; - sha256 = "03qb5ziwpd1x1jwvwsdipindlc0izwlmgnhinxyabhb17shsay7r"; + rev = "f5e5dda7587db72b074edbc3b573d52df639f9a5"; + sha256 = "1ddr28v44llmfsdf2l3ybgwijhv49dddghdk396nk0sw883a3hs8"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -245,12 +245,12 @@ final: prev: awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-05-16"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "39f8083c885149f52712b65b8d5380d63939bc23"; - sha256 = "1kc8lszdc4gglf5pyp7g6kb4kspml8rd41jv083p29ipwy9n8a8j"; + rev = "dbb29a451bb5441e860e70a35b925e43ab307e3f"; + sha256 = "1qd9rfbq0b9jj38arv2mwyrlg7vfpia293lbyhxgn3ilsl85m63h"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4ddb9df5d8e7b041aac7183a827b860e6d3433fd"; - sha256 = "1drr4rs8xcpfdsb6xj6577s72k2jmd9a6xamhnqw7k9w4qi8srwk"; + rev = "8ed122e474a0316f8b967bb6c35a47e8dd383453"; + sha256 = "0zk12wd1xs668j3wfdd5vyj685irnjsksrmn2dln6vsyb7xpq3r5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -557,12 +557,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "acc2b95be6652d79f86d586e52c7566557608476"; - sha256 = "1cp6sqvy3xwssr6dn7nzbxb4a2jpskqdbivpaf7984zd2sx8sqrq"; + rev = "3c3f118f8d48707f1890c2c212c083228aeac596"; + sha256 = "0nim2hd0pn910ymm87zwfcw5b7x64h3dsnqhc20yj0r3s5xjg6qi"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -678,12 +678,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-04"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "2d891bcece6676a4485b248ec9ee05c9acc76190"; - sha256 = "11ghs6qgx8qwk4ms4f5y1n4clial0xv1q03wsfk8z20w35bm1kg8"; + rev = "d2837688cb0de46712b602eb9fbd17c6c0a8047b"; + sha256 = "089vcjqhdbzld89w5rfw6rx2fnybc0xbaa3q6abpckyir175d7a7"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -966,12 +966,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c27b4c93fd117dcfec24894d30aeca0acdfb61c9"; - sha256 = "1q7l3iy90sy02bgrl3bkxk9591h05hha5icyhj48g8rh57s5rxhx"; + rev = "6ccd2d35581f5c497b2fe3e6a9ecbbb494210d6e"; + sha256 = "0fg8gv38xvsv7y739m1wix5a384zjn0hqnmkqiz244jxii1l0p8y"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1014,24 +1014,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-07-09"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "2a1760982049f5687e5529f686def375f3fc71d4"; - sha256 = "1pl976sv1y5c50xa4lnj3xnpzk08kycpsh88pq0w3v4kfhqlfdyi"; + rev = "29ece0ca76408c191e3c5ed997b239efb4b38f58"; + sha256 = "02s43lyqb17066wjjcl29vyky76svzaddclh1q6jh2awhixpsqx2"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-07-04"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d95fde4d1e042a99f39ddb8c67875fb10d1ed1e8"; - sha256 = "1wg1z85f816k60201hxrrdi4if9ci86cbg776k15pqdmcpzi0ibz"; + rev = "df506505ab2de577b35271a2b222042000a30381"; + sha256 = "0hqfbbcq4bnc48bknd7lfm41djq6977s18j14kyanp9gm7851sis"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1256,12 +1256,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-07-09"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "8433287fbebf0574ce0114ede52bdd2e4b87b530"; - sha256 = "05lnq0x1jbmms3adwp89vz2n0j5bqvlqb4siw6ajkylajakfz1zb"; + rev = "49151bc9f7a52b02e5aac5eb76bbb80ba81e3726"; + sha256 = "02csaq7x99l5h175kyy0bwdb8kdq3caldj6gkpc7lx7zdc987pwn"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1376,12 +1376,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-09"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "a29caf1b4926b9595a5a2ed3c83a140e05b8fe22"; - sha256 = "17g8vxww5diys5jllhj151ip4a7pjm9rpi285nzy33v009ixcp30"; + rev = "0aad4037902271c8c85d00d02e77f79ec2141267"; + sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1474,12 +1474,12 @@ final: prev: falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-06-11"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "0893abf44cd6dda4d50e98c4ab1f9aea8e61d617"; - sha256 = "12fa2kwg2495qhs845g31a9iszlrry4jc19famgpjg1glgm9lkrm"; + rev = "0a67fda0cb7908a43ea4d3c7b8d3d413e305c2be"; + sha256 = "1yjdj6n74z34lq7aayxnngkvyrcpgii9mh92l50jyq22mbqng4hj"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1508,6 +1508,18 @@ final: prev: meta.homepage = "https://github.com/konfekt/fastfold/"; }; + feline-nvim = buildVimPluginFrom2Nix { + pname = "feline-nvim"; + version = "2021-07-11"; + src = fetchFromGitHub { + owner = "famiu"; + repo = "feline.nvim"; + rev = "4c04c967691d028b4056f726735db329039cdff2"; + sha256 = "18z9dl58mfmffysr8g5drd6iy79fwn463lagp629cdghrjxcq65c"; + }; + meta.homepage = "https://github.com/famiu/feline.nvim/"; + }; + fennel-vim = buildVimPluginFrom2Nix { pname = "fennel-vim"; version = "2020-11-15"; @@ -1534,12 +1546,12 @@ final: prev: ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2021-07-08"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "d33fcf7b773b5ddb9ace508e3e77fd716f8d5c36"; - sha256 = "19lpfyp6xbz4ydsl6zn2q8c52lf7s0qbc1f6ksmpps896njpilcm"; + rev = "14d883975b2f1d50bbf7a6f74a04f39e59c0b06c"; + sha256 = "1hnn3x37iphbaam3h5kz0l6y09v2xr79p1nkhs10m939vxavg62k"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; @@ -1619,12 +1631,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter-nvim"; - version = "2021-07-05"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "9866548f1c543ba90d7bb8a62c4fa939a5dcba46"; - sha256 = "04289wv1zw7r30x7whzf2s9gis7g3a7l8wswsxiwf55zvrqr95j7"; + rev = "9efa18bc9552a8b2a00644f79d41f279be322e45"; + sha256 = "0hfq580ng3wlzkc9g44pz1ciwa9ax46ylka3s3y4v79szhviykby"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1811,12 +1823,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-05-27"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "b036b2f8a0f9cd973ab25292460e0c7b323616ef"; - sha256 = "1mn2pwcp482p7rrg0jk8i2g9pql58yqylzpp31308ssw32j8f9fj"; + rev = "97adf37032c213201c823e98b0555f7279525d62"; + sha256 = "0vca7pyipch3y3g19sfwqx33l8jh3h7r9wv3hlfw960iyqc2xia7"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1871,12 +1883,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-07-06"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "76e834e6c44ac176202a541cb46755303bdcc88d"; - sha256 = "0byzim4zl9hgr50qh8caq8d50xkjiplh1kp1jrpmfclzxwzzq3l3"; + rev = "3688c38b70eaa680a7100a53e2f12bcd367de225"; + sha256 = "18xkgwy3gfaq45wzixpr3ngskqqg0c2nziykvy323fimjvbvqxan"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -2063,12 +2075,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-07-06"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "3c46b25e2a12544e52c23377c4a0c43ab920ad65"; - sha256 = "0sajb93635rxgv5v3bhbakbfpg958vsj8yaln7d91ab87zhbq1zj"; + rev = "9c849dac4b8efe6ad30aabec995dabfb5b251046"; + sha256 = "0z0ddrqhpirjdck9j0dmaxx0ra5hlcll0iawqb0078xg181bhnwh"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2412,12 +2424,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-08"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "622d867706697c92016f79ea731be750a36693fa"; - sha256 = "1gs452xkcgr4h0iq6nradirl6arxwv1b61gxqldfmnlpz6lqyd34"; + rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd"; + sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2568,12 +2580,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-06"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "1cbd25bd666f2bfbad480a5b9b308e64dbefdf71"; - sha256 = "0xyiii94ciyki82ck2h88daazs1c17h944vv6caafijs1jqly7xi"; + rev = "a3c62fc1d2bb9fffa14b42b97c100f148e96f15b"; + sha256 = "0mp4p5d2m51f716938pzm8xifh8nxlmspdxpwbzqgnkf1b1rcvz0"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2614,6 +2626,18 @@ final: prev: meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; + lsp-rooter-nvim = buildVimPluginFrom2Nix { + pname = "lsp-rooter-nvim"; + version = "2021-05-25"; + src = fetchFromGitHub { + owner = "ahmedkhalf"; + repo = "lsp-rooter.nvim"; + rev = "ca8670c8fc4efbd9a05f330f4037304962c9abbb"; + sha256 = "1p24gk4yps21wm8gwrsp9a6c2ynwv6xlp7iny2448l2yvrjw494n"; + }; + meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/"; + }; + lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; version = "2021-05-20"; @@ -2640,12 +2664,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-07-09"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "4596cf854b26b14a1fcb720ea0f724bd02ce7b0d"; - sha256 = "1lc29yya4lfzjz8y2rg2inkfdb1khbzqr4z4bfzy6m9g1sbq5krb"; + rev = "27fa218ca099a07eefbe9d5b5e57f06887b48b5f"; + sha256 = "0yi35p05f28dm6l1qk93chizachnk2ciybrnvqcnx0ry0cipd727"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2688,24 +2712,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "72323c10fe2d91695f7593e572496ab9f004afee"; - sha256 = "05j9qbx43mpa3yn686xa9604lr4v829400iq09nh8h0l48xznjkk"; + rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980"; + sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-30"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; - sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; + rev = "a787bcd1d9afb2bd6bab13834c5b28e727f266c0"; + sha256 = "12i4bvgm26sfvdanjjwz1572nfnyax1i2bwawfkz2ab34xlwcr0y"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2784,12 +2808,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-09"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "3e3630d8de902904dc6f4f059132a1d4a65be1e1"; - sha256 = "19n6qmq6hms5582dam1d5psywg9mcvfx6ichh5nkj7calgwzb73y"; + rev = "1db8e5588bfd2038efb690de5991746c8bf03543"; + sha256 = "00mpza33p3yybr3fgigx7gy8faj8f5ypdws9aymxs30a12p67d1q"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3108,12 +3132,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-07-09"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "7a133c83b174bb40019f42ecc2a80c09bff53f33"; - sha256 = "0y78h67m7jq65ngc8jd8qdlxsb4rhsxz21dxjyy5bx7ic73kqv1v"; + rev = "bf148e2534097988e61ed334edaf31b67134369b"; + sha256 = "157k4gbs0r92zwm41hh40gqxc9774g05ngan936ivnnfg5j9igsg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3156,12 +3180,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-06"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "67a87013ea5c976e6fe85fef6dafc46c8ef648f6"; - sha256 = "0qdlks0cj7c8fyzk7012i4i39whgnq3n41mn3557ljf9dzd1d7b2"; + rev = "4a6eb9d52d544d378c82f17c448eb9c697cf448c"; + sha256 = "14hsyy23xb5p8lfna3kiarr0na1n1bykr8scwslczhpi9fwcgq85"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3264,12 +3288,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-03-25"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8"; - sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb"; + rev = "2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2"; + sha256 = "0gny5xw4knvjlkgazygpkwy8fk2x8igh45f980ypjghfkiw8h5f8"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3348,24 +3372,24 @@ final: prev: nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2021-06-09"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "537c66ca7c1308430b00dab41d9ad9c4201555f7"; - sha256 = "18v7xgag87czxnm2mvxg273z88gc8bh4jgzl1rh10y6kbbyv9c82"; + rev = "7e8d8abec9226d3697a9725b24a7d840623c6b66"; + sha256 = "0zi86iqc6hznf6vnmhyk7rlqwmkl0gxvjsc55ygxkypa1075lqg3"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-09"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "7afd14b657bc8930e4446d4cec4e51511d04dd33"; - sha256 = "0l23g43b2vinl29x60qn30ax8k2x53x8v2zf3q57sg50csw56avj"; + rev = "05814232c4369ef36961123de6ff3826936e9784"; + sha256 = "16z7kk8cvf52xnpkw8jvaaskd6zmah14va8cfgi52ckfl482w2pd"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3382,14 +3406,26 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; + nterm-nvim = buildVimPluginFrom2Nix { + pname = "nterm-nvim"; + version = "2021-07-16"; + src = fetchFromGitHub { + owner = "jlesquembre"; + repo = "nterm.nvim"; + rev = "8076f2960512d50a93ffd3d9b04499f9d4fbe793"; + sha256 = "0z2d9jvw7yf415mpvqlx5vc8k9n02vc28v4p1fimvz7axcv67361"; + }; + meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; + }; + numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; - version = "2021-07-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "0ef6d11bd94bc2ef6f311d8f05bd2a4d6471dff6"; - sha256 = "1li62nffx0jq1w97mra4hgfzphvna9m1qgi1fqc4r0vp54dxv3y9"; + rev = "c8b128230adb22727256fd24a221f4c5a1b41e93"; + sha256 = "0dg5cym0rcjy198rhkd61mhq1mg7lw5z4vprik8aimgnlqdzgqad"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -3420,12 +3456,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-06-29"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b64fa0d85e9e1b6aa86c8c44cf8a604840a571af"; - sha256 = "1sqjxf5w77aa0jxzk3yz9l2qw9xja7i9vxnrajajf1m7wa3zm4nl"; + rev = "e599e15f9400e6b587e3160d2dff83764cb4ab7d"; + sha256 = "08mn2z6q94x8fwic9r0vhzw0y93sm9ww6z458bd9hsxibfjsklgc"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3444,12 +3480,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-07-05"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "27641367360d64e67ea8f4d47e950a24c71a99e8"; - sha256 = "0yjmf651gdyi6ngpbb7y8bjf43snv8di54yldfm6l7xgawrwn3nn"; + rev = "46e6469fb1ef90d475fb43c56e0eeb81eacf08dd"; + sha256 = "1mj134zmrq9ldvl7w2m4769az9g2iyk4fvrpahaz93czdx9ac6gh"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -3468,12 +3504,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-05"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "d66f0e45243a46fc3fd0d84ed7d54e37882207ba"; - sha256 = "0rwihzz2lcyza86bgmmvny685g1nlz23yagz5agdqjzibqz973xf"; + rev = "cebafb95622205a414a6c10bf0e40d197cc652b1"; + sha256 = "1qd8gaigkyhkz5nrizc3jhwa69v4fcymd2446l0s24pv3kxc2an3"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3504,12 +3540,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-09"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "4365453208d646276b28d66a6498e6f85b014b93"; - sha256 = "1gr77222dlv085392y03azbksr5hxlygrjw0nrki2v6k2xhisq0a"; + rev = "29879b29b63fcd315e247a110a505e6a337b584a"; + sha256 = "18ybvc2l07l91gkl3w63l58pm9q7bx2p0fmkyxpqb48cii98n4yj"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3528,12 +3564,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-08"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "aa1d278069ffaff83c9ee10f18e80c5070dc5aae"; - sha256 = "1xnhxpp4g6lfqgrvjfa9333asjs60799qj9ysvx0230a3fnwwjg0"; + rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6"; + sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3612,12 +3648,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-07-02"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "846187eef85e39997c7b9f101e5169c5b57ec4a8"; - sha256 = "183szh75a3ix715i1hjr7pbcxw6l75l476snjda17ia68fg6zj6r"; + rev = "391e55bb5f90bc23e47c3b57eed6c6fcc95b0e7f"; + sha256 = "1djjdllr1klzy9yggkwmv7cv8gcpyb96mw1c9qfq9vdi5fmhcsyn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3636,12 +3672,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e5e06b4254ccf720c981cbfc4c2733548b4d88c5"; - sha256 = "1afmb701y4gmv447sfqsx74c8zn24d1rxb54svgw6iyk3iq0jjyl"; + rev = "9d49032a64d8a275123ad7f84e9c699d279307fe"; + sha256 = "18z22v8qn6jhg16hsrldqaqqp987w1nnqz0lhn0byzbsac62xwga"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3708,36 +3744,36 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-09"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "1f1bf3b3efd9b3d4bc1a47bcdee980ff554fbce4"; - sha256 = "0kbxxzh0qpr9cwnk61iyf9hl45kshm21mv8zybi53pi2hygr99k0"; + rev = "96af0fa98252ab3543ff1464c6452930f242c615"; + sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-07-07"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "933d69a37fa5e7a89dc7470376fbed9e692f4253"; - sha256 = "1ahxa1zp66vfj49lc5n7dmsw9l1xg68safn4cj2skf0ygkyqj8a9"; + rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3"; + sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-09"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "08c6a3fb555288250523faf652f2d225f4aceeba"; - sha256 = "09jcxdvk5zdpw9wkrww5g8m68nb48mywjnp5x3ql1kpxd189gpw3"; + rev = "d779ee79f0426711f84b770bf6ff4afda4f41c1e"; + sha256 = "0svnb4fsqsjhlqcikq0kgrwyrqfqplgvx93mhw1qhpmwfbgqn6vi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3792,12 +3828,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-06"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "72e51738bb6bf966f3f0b336739eb02cf3f8266a"; - sha256 = "0abp18d2ha3f3hnkvs4g3wndkwb5mfi5ma7bbh7hi2yq1dav9a64"; + rev = "15e8a45517c596b9acd9406bcb6f650d6bfdb339"; + sha256 = "1m1bc5w1qw8cxjnhhanh7rw78d3zkdxm6vgldh22zhmvgj1cb7zl"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3900,12 +3936,12 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-06-22"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "a4dadcd2a37ea69624a808fd8fd47b540c797a45"; - sha256 = "16pqifn99c1y1g70pg2rqh6pr5p3cznl68l77z7b4rjpk01s9c2v"; + rev = "ee4b22cbae8a3a434fad832bd89a6981c7c061af"; + sha256 = "1fz3ly97w0n8viarlqil2q38s6hwd0lzyyi2jvpqsg9bj07dg4k3"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3948,12 +3984,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c03bdafcaf000ffe422a31c7b450641ebd644041"; - sha256 = "1c01i6z9kafm5pv9p1j6g5jhg13ynixzwq8g14pcvjsdnzbphffd"; + rev = "d693133efb4a1f171d581dad8d399d6a3cd4b90a"; + sha256 = "1avcdfsq14nqbqrvlgz7cslaxi1ni5lsvz78dj5xc35ppgwyr1ci"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4044,24 +4080,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-07-05"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "6e0037c974d17b2883e3f0f38bb3cb6b1daa5feb"; - sha256 = "0rsdk3ib2sxg6k4k33mcbfrqh7m612jzynzwx3kzh2rmrh1n7i31"; + rev = "2715d35f27cbdfe6231e48212d12be383013f442"; + sha256 = "0z1vlsdmhlw6pbga9nypsihzjybglyr8is3maqbyqswrmz1yg87h"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-07-02"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f"; - sha256 = "071gdhrrbrhdmagai3q8c4yzc9kn794aa7kkacnknkm5kzswb8hg"; + rev = "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974"; + sha256 = "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4105,12 +4141,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-30"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23"; - sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv"; + rev = "080d24394b9abc93b6cd7635cb96c7d6601759a3"; + sha256 = "19xc61xfdyi21k9wbs63iynkfysqi3v28897bqig8myjr1mifbpb"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4297,12 +4333,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-07-06"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "4e79f208b4642578edcded89f889d6c76653abbd"; - sha256 = "041psdy4nsxhvfxx51anj58iac619p0dx9sp7710vvfwg526jifr"; + rev = "8b02ba8dc9a2946f90f51cc43ff1175b0f916616"; + sha256 = "10xrwxm5qpb1d25d5kr485xik4wmgr0pz92jn9w5rbf6widsdi7a"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4393,12 +4429,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-07"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "0bf6e0986ddc5677a6ca60a59624e49234c368a5"; - sha256 = "0anvnb1szy2w5dsvnznkdcppmcn6sd2d1419ny0bv3hb4bg07jcy"; + rev = "da8fb66af44fe2472b58fbf0b83ad4fe2243aaea"; + sha256 = "0mkjb42ff0w80kbik6hwdx1hvhxlihq17fqypdagmxk58wn71z9y"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4477,12 +4513,12 @@ final: prev: semshi = buildVimPluginFrom2Nix { pname = "semshi"; - version = "2019-12-01"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "numirias"; repo = "semshi"; - rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279"; - sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx"; + rev = "39c7500032f35711aecb492affd989433b984f14"; + sha256 = "14hv67fhmq85m382grc6h07r5xs83mmx3j8nf94j60gwbybhlkdb"; }; meta.homepage = "https://github.com/numirias/semshi/"; }; @@ -4537,12 +4573,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-06-24"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "8703f642db4e545525e6fb10e97c843c74c61964"; - sha256 = "1rmrxr53i7vmwh7wrrbcb24jyrqrph6bqr2bifhhgwy1kxx04gvg"; + rev = "960afef88aef374d3525e1536bdd505727b42d67"; + sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -4622,12 +4658,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-09"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "446acd165dcb75b145c2f818aebdb492ff179640"; - sha256 = "0xzpp020w52jfpzpb63jw6495dfkafjlkzdri4dzx8ip2l05wa4g"; + rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace"; + sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4875,12 +4911,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2021-01-14"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "fa891e62903501f7eeb2f00f6574ec9684e1c4ee"; - sha256 = "0cra1l31fcngp3iyn61rlngz4qx7zwk68h07bgp9w5gjx59a7npz"; + rev = "e431d0425f4b132caef736ab682ba917edee30e9"; + sha256 = "17d5qa5y809sss4rk5gl75fxbh04nychjgpag6xjd8fzwd51xmzr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -4984,12 +5020,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-04-17"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "721300e3d6f4a7157a781014d3d69bb1c7b702a3"; - sha256 = "1981lfk7xckvf2jmhnnrb58iwb1s3qzz84g52h4rvbjr7dbrr4xk"; + rev = "5173a42d4a306567a90c41fb90ee660a3274d34f"; + sha256 = "0baphixbfwq3fd3wcxf1fjgb7qwr7l0p6c8rpqf80msb0d7ikv77"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5045,12 +5081,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-08"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1dd6f8408b6e3334ddba695a7c4e0fd500f9bff6"; - sha256 = "1jkfaln6m21a1vb44qf6aj1xzl3acfx6d22lzhxn2br2n5ljm5cg"; + rev = "37a3a68a78e15900254ae5d9d4f9f0b5100a1735"; + sha256 = "1a5hsjsz62nb5hlrd0k8wbcnyxa3574jgipphs9s2llf6qfwkfh1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5141,12 +5177,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-07-09"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "9b276ebeeced9e15707c27e0b2588e7b3e19d9c5"; - sha256 = "1h0gyay7z28q7rdmv6kz8nkn4mxg7m0h99fd767l5rjrzimyxgms"; + rev = "4a27e05519827ba1594d5ce3fde874040f005bfe"; + sha256 = "0g6dxyd7vh89rg4xfdl20djfdcv1scq44mvxd3imzb7yhrhdpa95"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -5164,6 +5200,18 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; + tokyonight-nvim = buildVimPluginFrom2Nix { + pname = "tokyonight-nvim"; + version = "2021-07-09"; + src = fetchFromGitHub { + owner = "folke"; + repo = "tokyonight.nvim"; + rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9"; + sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28"; + }; + meta.homepage = "https://github.com/folke/tokyonight.nvim/"; + }; + traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; version = "2021-06-16"; @@ -5236,6 +5284,18 @@ final: prev: meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; + twilight-nvim = buildVimPluginFrom2Nix { + pname = "twilight-nvim"; + version = "2021-07-13"; + src = fetchFromGitHub { + owner = "folke"; + repo = "twilight.nvim"; + rev = "f5718ddbd9bba3184493a4fc11cd38342966904f"; + sha256 = "1j532h0imw782rvhg75ryqmy5lm0clg32fs3a1cm84srx97l05fp"; + }; + meta.homepage = "https://github.com/folke/twilight.nvim/"; + }; + typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; version = "2020-12-08"; @@ -5598,12 +5658,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-07-06"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a94d8034c3d6548575482b434a6cead8acc1cfab"; - sha256 = "0gm3lk2inngmy7a664nhqh42likwdpj0i9p31239y1icrzi413rz"; + rev = "4807a211cdfab3a5b5640111978ba301461c5ac1"; + sha256 = "1lrx54cfd9x6dx3kfz6x6jwakmkisj5y55s156fchdf83hsm967n"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5622,12 +5682,12 @@ final: prev: vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-05-18"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "531bcc9e5a4cb1b1fb4dec8face230bf3d205ac7"; - sha256 = "05yapm3g9rj7k69dhlm7hspakbczwwlbx1lcdydvkx639ka7j09d"; + rev = "97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256"; + sha256 = "0cbxjb1q7xlxykzq4ab4n3ny768ysf97f7h7d9spfmw286j3c2wi"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -5646,12 +5706,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-07-07"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "3c617dd5affe824d778ddf923a1c12c32ab5b881"; - sha256 = "00ycm753s3jqbj73ycwdvwp8v9y26pf351a1pmz8xzfxngh7f0pn"; + rev = "9be0a3c46a45c7a790022e5e3e293635469446fb"; + sha256 = "16xgidkd2v2g5zljfpdx82nai7cxq4nzw1irdfsdllv4ns9q27si"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -5850,12 +5910,12 @@ final: prev: vim-capslock = buildVimPluginFrom2Nix { pname = "vim-capslock"; - version = "2019-11-13"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-capslock"; - rev = "84c9e467a7b8e5aabf33674ed17c6356cf98777c"; - sha256 = "1c2fr8s9im3vxrszsrzm6wvad6disbdslmq6lqdp4603ialy4kja"; + rev = "a910e686986b239a7885e67ab6914638f88e914b"; + sha256 = "0aiqs4m5vfc22lcjkb2iphpb2qi7bz994lbjr2frsb8g8h508h18"; }; meta.homepage = "https://github.com/tpope/vim-capslock/"; }; @@ -5898,12 +5958,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-08"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1dab6a823a492f5e000b8db18542b36a26bdb3b8"; - sha256 = "1vhnjzx8d7r4ayid9gkrf1pmh3d4x862114wdbk7bha7r5kb01r0"; + rev = "e8fda02cd9ee8cbd4955a387cce3752584b85ac0"; + sha256 = "1l88pxfxjjfc0wfgkr2nj2x3dp3sj2xghyjzihafdp4nrynvygb8"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6618,12 +6678,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-07-03"; + version = "2021-07-14"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "729f932a31c5cfa7dd43d25d1adfcf50feee2cc2"; - sha256 = "1x4azjsc53191ylijagxpiidad0cgiaxyq7bpg1nx94yg8vcnp3y"; + rev = "daf9389e827dd19d804ffaad19cc8b64e389da6c"; + sha256 = "0kcjfi61md9n0fgnypamvqsc9k4mykr9wx978qna2xjb19vfkvad"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6678,12 +6738,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-09"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "f920245d6b1f34619cf0b971ca433c2dc49b6131"; - sha256 = "0h9l2zk1p15azhvy4lfzi5blsdz69jldh1y1ljhl79jj3dgla0xp"; + rev = "1c2663f516c32f8453f542be10192a49ee844a93"; + sha256 = "01gh4p2d41khx5cb7hcpjp9gs5fkgil838rnik1gawiw7w83hnaa"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6726,12 +6786,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-07-02"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "71eba9bbba9c00337dbd132cbc12b1952daf0d29"; - sha256 = "161a546b7gx22j42djxbxirs34pis0kgwz71glqqj6zr32rzapfm"; + rev = "75047b7d812cbe182ee04f0956bb31ba7efd46b0"; + sha256 = "00hz040ar9ka3mcf2pgjc6iwznh7baqi6q09xkpr0pnjhm9k0bci"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6750,12 +6810,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-06-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90"; - sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8"; + rev = "7d9b7125ff2533f6c520573f54e91db2f13a44b0"; + sha256 = "1ckz2b7y6y483d0ignkv8mm0xf9jbs8k3srp50m7sj24nsdadb1v"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -7689,12 +7749,12 @@ final: prev: vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2021-07-08"; + version = "2021-07-09"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "a051646d8528799fa2c0668b35eab756d14605aa"; - sha256 = "0b03mfwihb8swqm2wgw2s1zlszjj1fcs05p84yvfvq8m7lyivgnd"; + rev = "6442747a3d3084e3c1214388192b8308fcf391b8"; + sha256 = "1acmaabzqc01gvnxs8jfpiwmgyrd4d20p3lm3g2xsg5zv1l67hbf"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -7725,12 +7785,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-07-09"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "b662ebc5fb5f995d8565aa3f2cb5c48fa018bbd7"; - sha256 = "0l2a5cl6j1bmxc536893dfy7dcgrmzb70lh4wj1bd4nms409wrqx"; + rev = "8b4bccebf7a16938c77073983d643ba22aa04079"; + sha256 = "11livwi2pvnrxj7mildh46a6rli6hibpbffc9a5q6vxkvn9s6v29"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -8649,12 +8709,12 @@ final: prev: vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2021-07-08"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "b999e0a21c4618b635f0a795ab4b59d8648aeb31"; - sha256 = "0wddf9jd1zwajwhh87jvvlvk52ng0f37ffrq4ahf458si7r8ywpf"; + rev = "95374ad3e4b5ef902854e8f4bcfa9a7a31a91d71"; + sha256 = "0ns80kjirk72l5lapl7m32ybyr5q71p2mr8a45ihh1k2dlc2wv06"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -8673,12 +8733,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-06-28"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "749460bc5b05b1f4015a041508031d99b1b24982"; - sha256 = "0f1n0gg8asz0sg81dwc3gg5nl5j142qyd960f7fzdiv7grv7l0xk"; + rev = "e77399e64d6f54a623c52797973a23ecfe28b813"; + sha256 = "13c90zq8pxd1kfrk5f0zj6r48v86j4fnijss71j7ilb38mj4dyxq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -8757,12 +8817,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-07-08"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "ea2ed4bdcd4facaa83d1a44ccdb3d614ad62fec0"; - sha256 = "1zbbr4fbqn36b63mi9wfjl125b8ml9361vin6hpv4zjhhf8xn06w"; + rev = "e82e635e1e188b1d00fa9ed3de21794c07ea1445"; + sha256 = "1623rkqni2xbz6jl8cs848db0gydnpsp0nxss6rg2cp9l813k68f"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8889,12 +8949,12 @@ final: prev: vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-07-02"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "37590260914178e04b46d1248e444e718da519c6"; - sha256 = "13cvpb2fkqsj4m8lz6b7znmgayaf1sadysn07z2x2fs7ca856hrg"; + rev = "f0b17ac9f1bbdf3a29dba8b17ab429b1eed5d443"; + sha256 = "0j87i6kxafwl8a8szy2gzv7d0qhzwynd93iw8k0i42jnpqm8rp3a"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -9214,12 +9274,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-07-01"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "f994695813ebaecc9e37c7ea216c65d9cd659767"; - sha256 = "11n0g6d1yn38lrshlbzc28sfn1qghsjd2nmxzbp86vwm8dysxm5i"; + rev = "46c082aad84fd83c3c3d962c65afa800c2c33d85"; + sha256 = "1i3vz8c2v0ygk2m512phkpb8hcz1jj60k583yjkra9l78y7dj7y5"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9358,12 +9418,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2021-05-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "cd88d9bc34ca1df6bd06a9e427350d45a6c2931c"; - sha256 = "0gf0xla3jm8cp4j5mldn79kfbd3zlwil3wdgdvsx8w3kybi6dap1"; + rev = "df53e9c5fce91a84e1d6e8722956a01595d16c40"; + sha256 = "0zndnmdmxlr6114d29sc1q8fc0s2zlsrj1v28gp0sgnim1rmavfp"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -9562,12 +9622,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-07-04"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "da39c4955c2ad0ffa28f5cba81651b568697629c"; - sha256 = "02c7kxfalp52k2ij5r6hjnvqd2azkhx9sglqr85bc53rvh1rgi7y"; + rev = "9c806d2a014a21ef4bce49a18791d04e1a66bdf7"; + sha256 = "0imqzcdw28d5nmv2837x1m07pmir1yh9zbf52nsnvibw09z26kg8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9575,12 +9635,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-09"; + version = "2021-07-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ba23a80f0762852127927becf223d4a011e2388f"; - sha256 = "1jv04ja5c2q7wpbkf5f3kndr1n5aspyddvwpwhran2ffjxnjaqk6"; + rev = "431f520553bfe721d1ef5db0bb23ec03a86c00a0"; + sha256 = "1a9j27404hi8s3v7h9kghl7xwgmcblbranlp6kclvvrl7wahvnhg"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9779,12 +9839,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-05-29"; + version = "2021-07-10"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7c5e526f1aac81e4913be72a5a891e8de38925bd"; - sha256 = "1p3rgw1fx6ficzyk7ba9s22aj9xjsf50ipkx4bdmp4a2zskacqcp"; + rev = "dfa61676a32d096aa05003ace3ba8b977c136e1f"; + sha256 = "1mj35p5ym92qi4gjfnvfxqv328cgwp8sp2sldw54g6f6yxfzi37a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7ddb273cd52..02280936740 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -2,6 +2,7 @@ aca/completion-tabnine AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main +ahmedkhalf/lsp-rooter.nvim@main airblade/vim-gitgutter airblade/vim-rooter ajmwagar/vim-deus @@ -136,6 +137,7 @@ esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer f-person/git-blame.nvim +famiu/feline.nvim farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 @@ -148,7 +150,9 @@ flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main folke/todo-comments.nvim@main +folke/tokyonight.nvim@main folke/trouble.nvim@main +folke/twilight.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim @@ -247,13 +251,14 @@ jiangmiao/auto-pairs jistr/vim-nerdtree-tabs jjo/vim-cue jlanzarotta/bufexplorer +jlesquembre/nterm.nvim jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-lua josa42/vim-lightline-coc -joshdick/onedark.vim +joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql jparise/vim-phabricator diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 19b816fbc77..c47e17b1c12 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -205,8 +205,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.6.6"; - sha256 = "sha256-CRd+caKHFOXBnePr/LqNkzw0kRGYvNSkf4ecNgedpdA="; + version = "0.6.13"; + sha256 = "098vrm28b7jpzk0c2d0cgxvdw4jsswzf18cx1m9jwsm1j40fp5f4"; }; meta = with lib; { license = licenses.mpl20; @@ -270,8 +270,8 @@ let mktplcRef = { name = "bracket-pair-colorizer-2"; publisher = "CoenraadS"; - version = "0.2.0"; - sha256 = "0nppgfbmw0d089rka9cqs3sbd5260dhhiipmjfga3nar9vp87slh"; + version = "0.2.1"; + sha256 = "0bfvzs4ac537zqhnqaa38jf4lhiy1fmqcv6lq89nnx8k963380z7"; }; meta = with lib; { license = licenses.mit; @@ -454,8 +454,8 @@ let mktplcRef = { name = "vscode-great-icons"; publisher = "emmanuelbeziat"; - version = "2.1.64"; - sha256 = "sha256-qsL1vWiEAYeWkMDNSrr1yzg0QxroEQQeznoDL3Ujy/o="; + version = "2.1.79"; + sha256 = "1cr1pxgxlfr643sfxbcr2xd53s1dnzcpacjj0ffkgizfda2psy78"; }; meta = with lib; { license = licenses.mit; @@ -474,8 +474,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "5.8.0"; - sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7"; + version = "8.0.1"; + sha256 = "017lqpmzjxq5f1zr49akcm9gfki0qq8v7pj7gks6a3szjdx16mnl"; }; }; @@ -776,8 +776,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.4"; - sha256 = "0kn2ic7pgbd4rbvzpsxfwyiwxa1iy92l0h3jsppxc8gk8xbqm2nc"; + version = "1.4.7"; + sha256 = "04ghqg4s7g7yylmvbxzwzpnyy4zin2bwlgvflh18m77w4j0ckpiq"; }; meta = with lib; { license = licenses.mit; @@ -824,8 +824,8 @@ let mktplcRef = { name = "magit"; publisher = "kahole"; - version = "0.6.15"; - sha256 = "sha256-fRXm70FXnHduoywI4YC9ya6/J7wyd6EBzbnrcijBIbA="; + version = "0.6.18"; + sha256 = "0sqzz5bbqqg60aypvwxcqnxrr72gmwfj9sv0amgkyaf60zg5sf7w"; }; meta = { license = lib.licenses.mit; @@ -1096,8 +1096,8 @@ let mktplcRef = { name = "crates"; publisher = "serayuzgur"; - version = "0.5.3"; - sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; + version = "0.5.9"; + sha256 = "0l26pyvw7n3bszf97yx6qps72acq112akg3q4jq5mvlibng1nwk0"; }; meta = { license = lib.licenses.mit; @@ -1198,8 +1198,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "105.0.0"; - sha256 = "sha256-my3RzwUW5MnajAbEnqxtrIR701XH+AKYLbnKD7ivASE="; + version = "105.3.0"; + sha256 = "11plqsj3c4dv0xg2d76pxrcn382qr9wbh1lhln2x8mzv840icvwr"; }; meta = { license = lib.licenses.mit; @@ -1252,8 +1252,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.1"; - sha256 = "sha256-X3ihMxANcqNLWl9oTZjCgwRt1uBsSN2BmC2D4dPRFLE="; + version = "0.14.4"; + sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; }; nativeBuildInputs = [ jq ]; postInstall = '' @@ -1323,8 +1323,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.11.3"; - sha256 = "1smzsgcrkhghbnpy51gp28kh74l7y4s2m8pfxabb4ffb751254j0"; + version = "1.21.5"; + sha256 = "1v1xs1wcigisr6xip31i02cfryxrb157sla34y59pwlnhc5x1gny"; }; meta = { license = lib.licenses.mit; @@ -1335,8 +1335,8 @@ let mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; - version = "0.9.1"; - sha256 = "sha256-/qJKYXR0DznqwF7XuJsz+OghIBzdWjm6dAlaRX4wdRU="; + version = "0.10.1"; + sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA="; }; meta = { license = lib.licenses.mit; @@ -1347,8 +1347,8 @@ let mktplcRef = { name = "whichkey"; publisher = "VSpaceCode"; - version = "0.8.5"; - sha256 = "sha256-p5fukIfk/tZFQrkf6VuT4fjmeGtKAqHDh6r6ky847ks="; + version = "0.9.2"; + sha256 = "sha256-f+t2d8iWW88OYzuYFxzQPnmFMgx/DELBywYhA8A/0EU="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/misc/vscode-extensions/update_installed_exts.sh index 659ed8da791..8e0af182cec 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/misc/vscode-extensions/update_installed_exts.sh @@ -48,7 +48,7 @@ EOF if [ $# -ne 0 ]; then CODE=$1 else - CODE=$(command -v code) + CODE=$(command -v code || command -v codium) fi if [ -z "$CODE" ]; then diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index f995c8c5c1e..6d0d49b9d39 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -3,9 +3,11 @@ , fetchurl , alsa-lib , dbus +, ell , glib , json_c , libical +, docutils , pkg-config , python3 , readline @@ -19,16 +21,17 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.58"; + version = "5.60"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8"; + sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ="; }; buildInputs = [ alsa-lib dbus + ell glib json_c libical @@ -38,6 +41,7 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + docutils pkg-config python3.pkgs.wrapPython ]; @@ -55,6 +59,7 @@ in stdenv.mkDerivation rec { "--enable-library" "--enable-cups" "--enable-pie" + "--enable-external-ell" "--with-dbusconfdir=${placeholder "out"}/share" "--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services" "--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services" @@ -67,7 +72,6 @@ in stdenv.mkDerivation rec { "--enable-nfc" "--enable-sap" "--enable-sixaxis" - "--enable-wiimote" ]; # Work around `make install' trying to create /var/lib/bluetooth. diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index a5445488534..4293f53e47d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-05-11"; + version = "2021-07-16"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw"; + sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a"; + outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index c670fc86d13..118a17c4c8f 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = let patch = fname: sha256: fetchurl rec { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/${pname}-${version}-${fname}.patch?h=packages/${pname}"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/c0b0b6d4d6d7b79eca68123b20e0c9fb82e1c6e1/g15daemon/trunk/${pname}-${version}-${fname}.patch"; name = "${fname}.patch"; inherit sha256; }; diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index 2b6bf6fc63a..a659908a7a0 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python, kernel, makeWrapper, writeText +{ stdenv, lib, python2, python3, kernel, makeWrapper, writeText , gawk, iproute2 }: let @@ -9,6 +9,7 @@ let inherit (kernel) src version; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ (if lib.versionOlder version "4.19" then python2 else python3) ]; # as of 4.9 compilation will fail due to -Werror=format-security hardeningDisable = [ "format" ]; @@ -33,10 +34,6 @@ let install -Dm755 hv_get_dhcp_info.sh $out/${libexec}/hv_get_dhcp_info install -Dm755 hv_get_dns_info.sh $out/${libexec}/hv_get_dns_info - # I don't know why this isn't being handled automatically by fixupPhase - substituteInPlace $out/bin/lsvmbus \ - --replace '/usr/bin/env python' ${python.interpreter} - runHook postInstall ''; @@ -86,7 +83,7 @@ in stdenv.mkDerivation { Wants=hv-fcopy.service hv-kvp.service hv-vss.service EOF - for f in $lib/lib/systemd/system/* ; do + for f in $lib/lib/systemd/system/*.service ; do substituteInPlace $f --replace @out@ ${daemons}/bin done diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 82e1cb66e2b..df807188f14 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -19,6 +19,7 @@ my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; my $buildRoot = $ENV{'BUILD_ROOT'}; +my $makeFlags = $ENV{'MAKE_FLAGS'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. @@ -40,7 +41,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX} $makeFlags"); # Parse the output, look for questions and then send an # appropriate answer. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b35c84513e6..aa0f19858b8 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -21,6 +21,9 @@ , # Legacy overrides to the intermediate kernel config, as string extraConfig ? "" + # Additional make flags passed to kbuild +, extraMakeFlags ? [] + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -97,7 +100,7 @@ let in lib.concatStringsSep "\n" ([baseConfigStr] ++ configFromPatches); configfile = stdenv.mkDerivation { - inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; + inherit ignoreConfigErrors autoModules preferBuiltin kernelArch extraMakeFlags; pname = "linux-config"; inherit version; @@ -116,6 +119,9 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags + ++ extraMakeFlags; + prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that # generate-config.pl from the generic builder can answer them. @@ -134,16 +140,19 @@ let export HOSTLD=$LD_FOR_BUILD # Get a basic config file for later refinement with $generateConfig. - make -C . O="$buildRoot" $kernelBaseConfig \ + make $makeFlags \ + -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ - CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF + CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ + $makeFlags # Create the config file. echo "generating kernel configuration..." ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ + perl -w $generateConfig ''; installPhase = "mv $buildRoot/.config $out"; @@ -151,7 +160,6 @@ let enableParallelBuilding = true; passthru = rec { - module = import ../../../../nixos/modules/system/boot/kernel_config.nix; # used also in apache # { modules = [ { options = res.options; config = svc.config or svc; } ]; @@ -172,14 +180,14 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9a5dcb7e1ad..5b7050b7069 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.274"; + version = "4.4.275"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1n4wawk8fi5s22177994vq9hzay49cackdabl9r1x8y2i9jcqmg4"; + sha256 = "1aiwq6019sibsw5smj6ii28cr64dv24c19k4n8c09nakhmhcg94i"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index a4d57135e4a..71a5f5eec31 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.274"; + version = "4.9.275"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0xdi33f25lbpplx36cz7chdsn7a6xdjvwxgvnmvrw7b2y0g45m95"; + sha256 = "08mz7mzmhk5n1gwadrc5fw8s40jk0rayvdpjcricl4sv56574lb6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index c13b37a74aa..da90ee69de8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.1"; + version = "5.13.2"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "140a9ngzlarin84mnnwgx6z3ckw431d578aixxl60ll5853gdakj"; + sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 76b5c1cf146..65632456963 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18132"; - sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q"; + rev = "18165"; + sha256 = "17birwp6byxr4yb8cbc0afssli84ds1p2sisjl4g6rx3r7yqvsxn"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index ec3aa7f7006..4c49dc9c42a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.123-rt59"; # updated by ./update-rt.sh + version = "5.4.129-rt61"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; + sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq"; + sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index f874762267a..77add0aef53 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk +, libelf, cpio, elfutils, zstd, gawk, python3Minimal , writeTextFile }: @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Additional kernel make flags + extraMakeFlags ? [], # The version of the kernel module directory modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) @@ -119,9 +121,9 @@ let # This way kernels can be bit-by-bit reproducible depending on settings # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled). # See also https://kernelnewbies.org/BuildId - sed -i Makefile -e 's|--build-id|--build-id=none|' + sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - patchShebangs scripts/ld-version.sh + patchShebangs scripts ''; postPatch = '' @@ -173,7 +175,9 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules"; + ] + ++ optional isModular "modules" + ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" @@ -307,7 +311,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. @@ -325,7 +329,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; + ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; }) diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/os-specific/linux/kinect-audio-setup/default.nix new file mode 100644 index 00000000000..94ae4806cf2 --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchgit +, requireFile +, pkg-config +, libusb1 +, p7zip +}: + +let + # The last known good firmware package to have been tested + # by the upstream projet. + # The firmware URL is hardcoded in the upstream project's installation script + firmwareUrl = "https://download.microsoft.com/download/F/9/9/F99791F2-D5BE-478A-B77A-830AD14950C3/KinectSDK-v1.0-beta2-x86.msi"; + # The original URL "https://research.microsoft.com/en-us/um/legal/kinectsdk-tou_noncommercial.htm" + # redirects to the following url: + licenseUrl = "https://www.microsoft.com/en-us/legal/terms-of-use"; +in +stdenv.mkDerivation rec { + pname = "kinect-audio-setup"; + + # On update: Make sure that the `firmwareURL` is still in sync with upstream. + # If the project structure hasn't changed you can find the URL in the + # `kinect_fetch_fw` file in the project source. + version = "0.5"; + + # This is an MSI or CAB file + FIRMWARE = requireFile rec { + name = "UACFirmware"; + sha256 = "08a2vpgd061cmc6h3h8i6qj3sjvjr1fwcnwccwywqypz3icn8xw1"; + message = '' + In order to install the Kinect Audio Firmware, you need to download the + non-redistributable firmware from Microsoft. + The firmware is available at ${firmwareUrl} and the license at ${licenseUrl} . + Save the file as UACFirmware and use "nix-prefetch-url file://\$PWD/UACFirmware" to + add it to the Nix store. + ''; + }; + + src = fetchgit { + url = "git://git.ao2.it/kinect-audio-setup.git"; + rev = "v${version}"; + sha256 = "sha256-bFwmWh822KvFwP/0Gu097nF5K2uCwCLMB1RtP7k+Zt0="; + }; + + # These patches are not upstream because the project has seen no + # activity since 2016 + patches = [ + ./libusb-1-import-path.patch + ./udev-rules-extra-devices.patch + ]; + + nativeBuildInputs = [ p7zip libusb1 pkg-config ]; + + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + "FIRMWARE_PATH=$(out)/lib/firmware/UACFirmware" + "LOADER_PATH=$(out)/libexec/kinect_upload_fw" + ]; + + buildPhase = '' + runHook preBuild + make -C kinect_upload_fw kinect_upload_fw $makeFlags "''${makeFlagsArray[@]}" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/libexec/ $out/lib/firmware $out/lib/udev/rules.d + + install -Dm755 kinect_upload_fw/kinect_upload_fw $out/libexec/ + + # 7z extract "assume yes on all queries" "only extract/keep files/directories matching UACFIRMWARE.* recursively" + 7z e -y -r "${FIRMWARE}" "UACFirmware.*" >/dev/null + # The filename is bound to change with the Firmware SDK + mv UACFirmware.* $out/lib/firmware/UACFirmware + + make install_udev_rules $makeFlags "''${makeFlagsArray[@]}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Tools to enable audio input from the Microsoft Kinect sensor device"; + homepage = "https://git.ao2.it/kinect-audio-setup.git"; + maintainers = with maintainers; [ berbiche ]; + platforms = platforms.linux; + license = licenses.unfree; + }; +} diff --git a/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch new file mode 100644 index 00000000000..a0c5ad99f9f --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch @@ -0,0 +1,23 @@ +commit 02fd6c4355809e1bff7c66d478e88f30bedde13b +Author: Nicolas Berbiche <nicolas@normie.dev> +Date: Wed May 5 23:14:56 2021 -0400 + + fix libusb include for Linux + +diff --git a/kinect_upload_fw/kinect_upload_fw.c b/kinect_upload_fw/kinect_upload_fw.c +index 1bd4102..351c94f 100644 +--- a/kinect_upload_fw/kinect_upload_fw.c ++++ b/kinect_upload_fw/kinect_upload_fw.c +@@ -35,7 +35,12 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN32) + #include <libusb.h> ++#else ++#include <libusb-1.0/libusb.h> ++#endif + + #include "endian.h" + diff --git a/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch new file mode 100644 index 00000000000..d58b970c7c0 --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch @@ -0,0 +1,15 @@ +commit afaaa77b0a03811f86428cf264397b60dd795549 +Author: Nicolas Berbiche <nicolas@normie.dev> +Date: Thu May 6 00:10:37 2021 -0400 + + Add support for other Kinect device in udev + +diff --git a/contrib/55-kinect_audio.rules.in b/contrib/55-kinect_audio.rules.in +index 25ea713..9e1b69f 100644 +--- a/contrib/55-kinect_audio.rules.in ++++ b/contrib/55-kinect_audio.rules.in +@@ -1,2 +1,4 @@ + # Rule to load the Kinect UAC firmware on the "generic" usb device + ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02ad", RUN+="@LOADER_PATH@ @FIRMWARE_PATH@" ++# Rule to load the Kinect UAC firmware on another supported device ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", RUN+="@LOADER_PATH@ @FIRMWARE_PATH@" diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index 4f58c9f3f2a..4c14d2ecae3 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 = "3.1"; + version = "3.1.1"; src = fetchurl { url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - sha256 = "0zff502w3nlycgv2ad8cy8nd0hqf34kzpzcygi7prp0lrw8mp3zm"; + sha256 = "1nf0w4xyzg884v8blb81zkk6q8p6zbiq9lx61jdqwbbzkdgqbmll"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bad7622771a..e10af3abf92 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.9"; + version = "4.0.10"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz"; + sha256 = "1sgsic9dzj3wv2k5bx2vhcgappivhp1glkqfc2yrgr6jas052351"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 440e81266c8..3ed80269d3a 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "sha256-8Tack2gM3AU3coGXs5hEbAaBCo5ss1sGUFFEjZDn5Lg="; + sha256 = "0zx58lair8hwi4bxm5h7i8n1j5fcdgw5cr6f4wk9qhks0sr5dip5"; }; nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 70fc5126a93..e6ad62b1128 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -20,7 +20,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + make IGNORE_PREEMPT_RT_PRESENCE=1 NV_BUILD_SUPPORTS_HMM=1 SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 0f69cb13fcd..4ca7f50b7d1 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation { sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0005-gnu-efi-version-compatibility.patch"; name = "0005-gnu-efi-version-compatibility.patch"; sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446"; }) (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0025-reproducible-build.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0025-reproducible-build.patch"; name = "0025-reproducible-build.patch"; sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls"; }) diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index c5c27f53004..8370dfb16a5 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand -, moreutils, jq, git, zip, rsync, pkg-config, yarn, python2 -, nodejs-12_x, libsecret, xorg, ripgrep +, moreutils, jq, git, zip, rsync, pkg-config, yarn, python3 +, nodejs-14_x, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-12_x; - python = python2; + nodejs = nodejs-14_x; + python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; in stdenv.mkDerivation rec { pname = "code-server"; - version = "3.8.0"; - commit = "c4610f7829701aadb045d450013b84491c30580d"; + version = "3.9.0"; + commit = "fc6d123da59a4e5a675ac8e080f66e032ba01a1b"; src = fetchFromGitHub { owner = "cdr"; repo = "code-server"; rev = "v${version}"; - sha256 = "1snc7dbqfz53337h6av2zhkrn54ypanxljs5by4jqczq96c2v6yk"; + sha256 = "0jgmf8d7hki1iv6yy1z0s5qjyxchxnwj8kv53jrwkllim08swbi3"; }; cloudAgent = buildGoModule rec { @@ -62,9 +62,9 @@ in stdenv.mkDerivation rec { # to get hash values use nix-build -A code-server.prefetchYarnCache outputHash = { - x86_64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; - aarch64-linux = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; - x86_64-darwin = "0xc1yjz53ydg1mwyc2rp4hq20hg6i4aiirfwsnykjw1zm79qgrgb"; + x86_64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; + aarch64-linux = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; + x86_64-darwin = "01nkqcfvx2qw9g60h8k9x221ibv3j58vdkjzcjnj7ph54a33ifih"; }.${system} or (throw "Unsupported system ${system}"); }; @@ -210,7 +210,7 @@ in stdenv.mkDerivation rec { ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent # create wrapper - makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \ + makeWrapper "${nodejs-14_x}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" ''; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index c259f962b04..da0e7364e95 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.0"; + version = "1.10.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256:0gc5shz1nbya7jdkggw2izbw1p4lwkbqgbc5ihlvnwrfdgksfqqd"; + sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256:0sxnnzzsp58ma42ylysdgxibqf65f4f9vbf8c20r44426vg75as7"; + vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; doCheck = false; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d052ddb7b79..e5192b7b3c1 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2bad8be0be95c8f54a26d1e16299e65f31ae1b34bd6ad3819aa50e7b40521484"; + sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix new file mode 100644 index 00000000000..8b9380c6baf --- /dev/null +++ b/pkgs/servers/headscale/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "headscale"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "juanfont"; + repo = "headscale"; + rev = "v${version}"; + sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj"; + }; + + vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; + + # Ldflags are same as build target in the project's Makefile + # https://github.com/juanfont/headscale/blob/main/Makefile + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; + + meta = with lib; { + description = "An implementation of the Tailscale coordination server"; + homepage = "https://github.com/juanfont/headscale"; + license = licenses.bsd3; + maintainers = with maintainers; [ nkje ]; + }; +} diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 2d98f377b3b..638dba8f56c 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "unstable-2021-05-29"; + version = "0.99.1"; src = fetchFromGitHub { owner = "hifi"; repo = "heisenbridge"; - rev = "980755226b0cb46ad9c7f40e0e940f354212a8b7"; - sha256 = "sha256-jO1Dqtv3IbV4FLI3C82pxssgrCf43hAEcPLYszX2GNI="; + rev = "v${version}"; + sha256 = "sha256-v3ji450YFxMiyBOb4DuDJDvAGKhWYSSQ8kBB51r97PE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index d9830df4f45..f226e0ad7e4 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.41.v20210516"; + version = "9.4.43.v20210629"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "sha256-hFQC1UiqZbbvyMf1FC3eqvVga3QdPWh0fbotatkVHBI="; + sha256 = "sha256-AfrmVLCZMuRGAZqoWeevbgXifbreErVM17rjJJ/HI9k="; }; dontBuild = true; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 96451764990..71490b34280 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -9,11 +9,11 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; nginxVersion = "1.19.3"; - version = "${nginxVersion}.1"; + version = "${nginxVersion}.2"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; + sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f"; }; # generic.nix applies fixPatch on top of every patch defined there. This @@ -44,7 +44,7 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = "http://openresty.org"; + homepage = "https://openresty.org"; license = lib.licenses.bsd2; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index e7d9b1a2847..7923674a3b7 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, php }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1zrni1hzblaangiqm7iqbvg2h9rdc2l3pzzymz52r7mri4qnr4s8"; + sha256 = "1vp2gdvgvw960178yaqql6iza0rg2h8japsnass3kkrwrmb2liq5"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { Analyse problems and act on them. ''; homepage = "https://www.icinga.com/products/icinga-web-2/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix new file mode 100644 index 00000000000..35b9357009c --- /dev/null +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "icingaweb2-ipl"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "Icinga"; + repo = "icinga-php-library"; + rev = "v${version}"; + sha256 = "0nzvd84r9f1mypfhq4p37hsvkrbd5wzgs1m9qhj45ncvf5rq49f1"; + }; + + installPhase = '' + mkdir -p "$out" + cp -r * "$out" + ''; + + meta = { + description = "PHP library package for Icingaweb 2"; + homepage = "https://github.com/Icinga/icinga-php-library"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/servers/icingaweb2/thirdparty.nix b/pkgs/servers/icingaweb2/thirdparty.nix new file mode 100644 index 00000000000..ae3ce9538c9 --- /dev/null +++ b/pkgs/servers/icingaweb2/thirdparty.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "icingaweb2-thirdparty"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "Icinga"; + repo = "icinga-php-thirdparty"; + rev = "v${version}"; + sha256 = "03zq6p2xyjrln8hdfks70hg8mwa51d3pnkswnzavpbxlbk83vzz5"; + }; + + installPhase = '' + mkdir -p "$out" + cp -r * "$out" + ''; + + meta = { + description = "Third party dependencies for Icingaweb 2"; + homepage = "https://github.com/Icinga/icinga-php-thirdparty"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix new file mode 100644 index 00000000000..6c6d6759f32 --- /dev/null +++ b/pkgs/servers/janus-gateway/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt +, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv +, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus +, usrsctp, ffmpeg +}: + +let + libwebsockets_janus = libwebsockets.overrideAttrs (_: { + configureFlags = [ + "-DLWS_MAX_SMP=1" + "-DLWS_WITHOUT_EXTENSIONS=0" + ]; + }); +in + +stdenv.mkDerivation rec { + pname = "janus-gateway"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "meetecho"; + repo = pname; + rev = "v${version}"; + sha256 = "15nadpz67w24f4wz8ya0kx0a1jc4wxv1kl0d5fr7kckkdyijh7gz"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; + + buildInputs = [ + glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd + curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-boringssl=${boringssl}" + "--enable-libsrtp2" + "--enable-turn-rest-api" + "--enable-json-logger" + "--enable-gelf-event-handler" + "--enable-post-processing" + ]; + + outputs = [ "out" "dev" "doc" "man" ]; + + postInstall = '' + moveToOutput share/janus "$doc" + moveToOutput etc "$doc" + ''; + + meta = with lib; { + description = "General purpose WebRTC server"; + homepage = "https://janus.conf.meetecho.com/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index a20068767e5..841ee7915a4 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "fts-xapian"; - version = "1.4.9"; + version = "1.4.11"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "0p4ps9h24vr9bldrcf9cdx6l4rdz5i8zyc58qp10h7cc3jilwddy"; + sha256 = "sha256-HPmS2Z1PIEM9fc6EerCEigQJg5BK/115zOW2uxFqjP0="; }; buildInputs = [ dovecot xapian icu64 ]; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 122d00c5f0a..702808f950a 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -5,6 +5,7 @@ , enablePAM ? false, pam , enableSPF ? true, libspf2 , enableDMARC ? true, opendmarc +, enableRedis ? false, hiredis }: stdenv.mkDerivation rec { @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { ++ lib.optional enableAuthDovecot dovecot ++ lib.optional enablePAM pam ++ lib.optional enableSPF libspf2 - ++ lib.optional enableDMARC opendmarc; + ++ lib.optional enableDMARC opendmarc + ++ lib.optional enableRedis hiredis; preBuild = '' sed ' @@ -78,6 +80,13 @@ stdenv.mkDerivation rec { s:^# \(SUPPORT_DMARC\)=.*:\1=yes: s:^# \(LDFLAGS += -lopendmarc\):\1: ''} + ${lib.optionalString enableRedis '' + s:^# \(LOOKUP_REDIS=yes\)$:\1: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lhiredis -L${hiredis}/lib/hiredis: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lhiredis -L${hiredis}/lib/hiredis: + s:^\(LOOKUP_INCLUDE\)=\(.*\):\1=\2 -I${hiredis}/include/hiredis/: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${hiredis}/include/hiredis/: + ''} #/^\s*#.*/d #/^\s*$/d ' < src/EDITME > Local/Makefile diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7940b560b5a..c7894529e2b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.37.1"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KxDHJrKm/QUZtOzI6MEpIUb4hTtxtIPLFuD1as3j4EA="; + sha256 = "sha256-k9/enFktixO4zvgBW3zw0COBakDP1PHVWAlbMi+FiWQ="; }; patches = [ diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 41b8b56fc44..c772b76cf03 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-mRDd9G/VMbDwp/GYPoUE0v9j+BmUd08wOMJjgcg2qdo="; + sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5"; }; - vendorSha256 = "sha256-sQFWdBOjfYb1e7ZzHGgtgnuEQCU4xnkJTyzC/9DRcYs="; + vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph"; + + patches = [ + # https://github.com/grafana/agent/issues/731 + ./skip_test_requiring_network.patch + ]; # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 diff --git a/pkgs/servers/monitoring/grafana-agent/skip_test_requiring_network.patch b/pkgs/servers/monitoring/grafana-agent/skip_test_requiring_network.patch new file mode 100644 index 00000000000..fcba11dd2fb --- /dev/null +++ b/pkgs/servers/monitoring/grafana-agent/skip_test_requiring_network.patch @@ -0,0 +1,15 @@ +diff --git a/pkg/operator/selector_eventhandler_test.go b/pkg/operator/selector_eventhandler_test.go +index 7b6ec602..e79bae0e 100644 +--- a/pkg/operator/selector_eventhandler_test.go ++++ b/pkg/operator/selector_eventhandler_test.go +@@ -39,6 +39,10 @@ var ( + // TestEnqueueRequestForSelector creates an example Kubenretes cluster and runs + // EnqueueRequestForSelector to validate it works. + func TestEnqueueRequestForSelector(t *testing.T) { ++ // Requires network access, which is not available during ++ // the nixpkgs sandboxed build ++ t.Skip() ++ + l := log.NewNopLogger() + + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 34a9511d0b5..034d5a0c386 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -2,23 +2,21 @@ buildGoModule rec { pname = "lndmon"; - version = "unstable-2020-12-04"; + version = "unstable-2021-03-26"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lndmon"; - sha256 = "0q72jbkhw1vpwxd0r80l1v4ab71sakc315plfqbijy7al9ywq5nl"; - rev = "f07d574320dd1a6a428fecd47f3a5bb46a0fc4d1"; + sha256 = "14lmmjq61p8yhc86swigs43risqi31vlmz7ri8j0n0fyp8lm2kxs"; + rev = "3aa925aa4f633a6c4d132601922e78f173ae8ac1"; }; vendorSha256 = "06if387b9m02ciqgcissih1x06l33djp87vgspwzz589f77vczk8"; - doCheck = false; - passthru.tests = { inherit (nixosTests.prometheus-exporters) lnd; }; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/lightninglabs/lndmon"; description = "Prometheus exporter for lnd (Lightning Network Daemon)"; license = licenses.mit; maintainers = with maintainers; [ mmilata ]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 0a60ebc77c5..578bb10652a 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { description = "The plugin-driven server agent for collecting & reporting metrics"; license = licenses.mit; homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; - maintainers = with maintainers; [ mic92 roblabla timstott foxit64 ]; + maintainers = with maintainers; [ mic92 roblabla timstott ]; }; } diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3f2b1798a2c..1776987bae0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,35 +33,29 @@ let }; }; in { - nextcloud18 = throw '' - Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by + nextcloud19 = throw '' + Nextcloud v19 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-06. Please upgrade to at least Nextcloud v20 by declaring - services.nextcloud.package = pkgs.nextcloud19; + services.nextcloud.package = pkgs.nextcloud20; in your NixOS config. - - [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - # FIXME(@Ma27) remove on 21.05 - nextcloud19 = generic { - version = "19.0.6"; - sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; - extraVulnerabilities = [ - "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed! Please note that both CVEs only affect the file encryption module which is turned off by default. Alternatively, `pkgs.nextcloud20` can be used." - ]; - }; - nextcloud20 = generic { - version = "20.0.7"; - sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; + version = "20.0.11"; + sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; }; nextcloud21 = generic { - version = "21.0.2"; - sha256 = "5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe"; + version = "21.0.3"; + sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; + }; + + nextcloud22 = generic { + version = "22.0.0"; + sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo="; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 929abe23cce..b6618eb429d 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.3.4707-ebb5fe9f3"; + version = "1.23.4.4805-186bae04e"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0b3xsyrpz1098lyqfapnjp7k55d07qg7h9avc7f3zmpkiclxf2ry"; + sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1as83prhlfi4g172k3mgm6p8k58zm4bahjf8bp8pyxcmgiii76m0"; + sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index ff2c8f9af37..e09def926e1 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1s4qpz4jwar3lcqyzkgyvgm4bghzass974lq1pw4fziqlsblh0vm"; + sha256 = "sha256-bAWQTdpqDF7ERQzNY1k0NtxdA9M9bIyfHtvX0nKfIQY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/unifi-video/default.nix b/pkgs/servers/unifi-video/default.nix new file mode 100755 index 00000000000..4c55d510259 --- /dev/null +++ b/pkgs/servers/unifi-video/default.nix @@ -0,0 +1,61 @@ +{ dpkg +, stdenv +, lib +, fetchurl +, jre8 +, jsvc +, lsb-release +, libcap +, util-linux +, makeWrapper +, autoPatchelfHook +, glibc +, gcc-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "unifi-video"; + version = "3.10.13"; + src = fetchurl { + urls = [ "https://dl.ui.com/firmwares/ufv/v${version}/unifi-video.Debian9_amd64.v${version}.deb" "https://archive.org/download/unifi-video.Debian9_amd64.v${version}/unifi-video.Debian9_amd64.v${version}.deb" ]; + sha256 = "06mxjdizs4mhm1by8kj4pg5hhdi8ns6x75ggwyp1k6zb26jvvdny"; + }; + + buildInputs = [ jre8 jsvc lsb-release libcap util-linux ]; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook glibc gcc-unwrapped ]; + + unpackCmd = '' + runHook preUnpack + + dpkg-deb -x $src . + rm -r etc + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -ar sbin $out/bin + cp -ar lib share $out + chmod +x $out/bin/* + wrapProgram $out/bin/unifi-video --set JAVA_HOME "${jre8}" --prefix PATH : ${lib.makeBinPath [ jre8 lsb-release libcap util-linux]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Unifi Video NVR (aka Airvision) is a software package for controlling Unifi cameras"; + longDescription = '' + Unifi Video is the NVR server software which can monitor and + record footage from supported Unifi video cameras + ''; + homepage = "https://www.ui.com"; + downloadPage = "https://www.ui.com/download/unifi-video/"; + license = licenses.unfree; + maintainers = [ maintainers.rsynnest ]; + platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ "Upstream support for Unifi Video ended January 1st, 2021." ]; + }; +} diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index ddfa6faf243..c6c65d58e35 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -14,13 +14,13 @@ let php-embed = php.override { }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { - interpreter = pkg.interpreter; + interpreter = pkg.pythonForBuild.interpreter; path = "plugins/python"; inputs = [ pkg ncurses ]; install = '' install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py - ${pkg.executable} -m compileall $out/${pkg.sitePackages}/ - ${pkg.executable} -O -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ + ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ ''; }; @@ -91,6 +91,13 @@ stdenv.mkDerivation rec { inherit python2 python3; }; + postPatch = '' + for f in uwsgiconfig.py plugins/*/uwsgiplugin.py; do + substituteInPlace "$f" \ + --replace pkg-config "$PKG_CONFIG" + done + ''; + configurePhase = '' export pluginDir=$out/lib/uwsgi substituteAll ${./nixos.ini} buildconf/nixos.ini diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 139a8588eed..1c35ebeff3b 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -15,13 +15,13 @@ let in package.override rec { name = "bookstack"; - version = "21.05"; + version = "21.05.3"; src = fetchFromGitHub { owner = "bookstackapp"; repo = name; rev = "v${version}"; - sha256 = "0vn1n2l66xsv2qjhh53dm28vwm7d9ba62syx2gviznva1lsyn78z"; + sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index aa3115ef955..69f39241f41 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,10 +5,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-3b3aafdceac4cb820e2ae65a8785e4d07db471a7"; + name = "aws-aws-sdk-php-35310302912fdc3b4a0e829b84424c41e3fd9727"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3b3aafdceac4cb820e2ae65a8785e4d07db471a7; - sha256 = "0pyc5n1h9c12li03wk0p04k25rg1x8qlq4ns4wr8xbxcysdm6xi1"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/35310302912fdc3b4a0e829b84424c41e3fd9727; + sha256 = "043ia45zlb3596cnh76yc7wvizr8acn5jrilnnqdv78v07s9c99i"; }; }; }; @@ -35,20 +35,20 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-3bb5588cec00a0268829cc4a518490df6741af9d"; + name = "doctrine-cache-c9622c6820d3ede1e2315a6a377ea1076e421d88"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d; - sha256 = "0r9fhv0y79ma7a5llmj1skycflnwbxyyrblkavjj6svld46li94q"; + url = https://api.github.com/repos/doctrine/cache/zipball/c9622c6820d3ede1e2315a6a377ea1076e421d88; + sha256 = "0dw03i597mffza3bllsh89fqwa61zwhp0gvs8hh6qzkhwmsw9rk5"; }; }; }; "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-c800380457948e65bbd30ba92cc17cda108bf8c9"; + name = "doctrine-dbal-8dd39d2ead4409ce652fd4f02621060f009ea5e4"; src = fetchurl { - url = https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9; - sha256 = "1x6bij89yaj0d52ffx683rlpxrgxl0vx9q6a121mkz1zplnif647"; + url = https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4; + sha256 = "107k0qr3m34cjxy00yhdjmd8liqa8wg729zj4z2jifz26niiy8qs"; }; }; }; @@ -125,10 +125,10 @@ let "facade/flare-client-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-69742118c037f34ee1ef86dc605be4a105d9e984"; + name = "facade-flare-client-php-47b639dc02bcfdfc4ebb83de703856fa01e35f5f"; src = fetchurl { - url = https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984; - sha256 = "1if56r0g9ymwankz40l5xhw5vch1qkjjy9914lz1vgbkj7ln9pvz"; + url = https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f; + sha256 = "1chpfxmnlpl98cg127i70ari7nb3w83l91l119hc2fhyjk0zrcy5"; }; }; }; @@ -165,10 +165,10 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-c13c0be93cff50f88bbd70827d993026821914dd"; + name = "filp-whoops-2edbc73a4687d9085c8f20f398eebade844e8424"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd; - sha256 = "0janbd93xvr5hy2bms05q1l31gmwbqrgjfvbzkmv3bfw4gcksq0i"; + url = https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424; + sha256 = "1x79vnjdbjk9z2mix75ri56kyc5iwvjv3dyivncg6n3wd80nyfgg"; }; }; }; @@ -225,10 +225,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-92c0417e60efc39bc556ba5dfc9b20a56f7848fb"; + name = "laravel-framework-00fa9c04aed10d68481f5757b89da0e6798f53b3"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb; - sha256 = "17wpm3fk6qakq4b8qf2bvmyzm7zfamiabdgqshzcnfjm7kj4rijy"; + url = https://api.github.com/repos/laravel/framework/zipball/00fa9c04aed10d68481f5757b89da0e6798f53b3; + sha256 = "1ryk6c23sa6lfsx2zpm8mcfng4ys474959kqg959cjaqzq47blq9"; }; }; }; @@ -245,20 +245,20 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-7d70d2f19c84bcc16275ea47edabee24747352eb"; + name = "league-commonmark-44ffd8d3c4a9133e4bd0548622b09c55af39db5f"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb; - sha256 = "1clfi4k0xp15pzg8c344qj5jk54k9dm9xbg4sd6l6iv66md1xasn"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f; + sha256 = "1nlydxyfsh51hrvxg5c7c5lqphynvdclch6w8k9dh1whl8pwjf27"; }; }; }; "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-9be3b16c877d477357c015cec057548cf9b2a14a"; + name = "league-flysystem-f3ad69181b8afed2c9edf7be5a2918144ff4ea32"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a; - sha256 = "0mhlr6l75j58xwbadq30x58s67434195zlpdax6ix4nkr7fc907j"; + url = https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32; + sha256 = "0s4sx4j7c16qkk7m6k2r4ajfjidlv15z18ybxhfmmz4jb4wsmv94"; }; }; }; @@ -305,20 +305,20 @@ let "mtdowling/jmespath.php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "mtdowling-jmespath.php-42dae2cbd13154083ca6d70099692fef8ca84bfb"; + name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; src = fetchurl { - url = https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb; - sha256 = "157pdx45dmkxwxyq8vdjfci24fw7kl3yc2gj1cifp9kaia7mwlkk"; + url = https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb; + sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; }; }; }; "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-8d1f50f1436fb4b05e7127360483dd9c6e73da16"; + name = "nesbot-carbon-f47f17d17602b2243414a44ad53d9f8b9ada5fdb"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16; - sha256 = "102pypd7x9l739qv2fp5lv4gw4sywr1jpgxlgpqyi1ww1dm3dch0"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb; + sha256 = "0b7pr4cqg5l75fncw1lzxcpn4xjnjddyrz287lb4zrjgx1raz3ah"; }; }; }; @@ -555,10 +555,10 @@ let "socialiteproviders/microsoft-azure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-microsoft-azure-7808764f777a01df88be9ca6b14d683e50aaf88a"; + name = "socialiteproviders-microsoft-azure-64779ec21db0bee3111039a67c0fa0ab550a3462"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a; - sha256 = "1lxsvb5pzqrm467a8737v98sgmsxs6mvxc683p19b2y30g4fyrlj"; + url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/64779ec21db0bee3111039a67c0fa0ab550a3462; + sha256 = "00jjj7jwmhf2nypwwnmv5rbw6mw0phdlcz8rxybxzy72p2v51m1c"; }; }; }; @@ -615,30 +615,30 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-1b15ca1b1bedda86f98064da9ff5d800560d4c6d"; + name = "symfony-console-9aa1eb46c1b12fada74dc0c529e93d1ccef22576"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d; - sha256 = "0xpk6241vg866z56dksv384xmk0vkrz1by9vb8q2d6cbp6nw17y0"; + url = https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576; + sha256 = "0xsjpsgdm2x2avw92cgx90r5yvpgqfcy0ad8cviwcfdardqfh7z0"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-947cacaf1b3a2af6f13a435392873d5ddaba5f70"; + name = "symfony-css-selector-c1e29de6dc893b130b45d20d8051efbb040560a9"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70; - sha256 = "1v5fl6vhbc2n9mm0y9m28i1gz12n1v0zqzc2sspymyq98921q3gp"; + url = https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9; + sha256 = "0af571s9i7inwsjbqpf5dkpghs2k5ds8ba8x7wdvad6hpgphify8"; }; }; }; "symfony/debug" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-debug-45b2136377cca5f10af858968d6079a482bca473"; + name = "symfony-debug-a8d2d5c94438548bff9f998ca874e202bb29d07f"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473; - sha256 = "0p7g2mwrvg8x264kl9kn7a23adnqxh66jy1kjczq5c5xlpw2rxdb"; + url = https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f; + sha256 = "0w0i66c42bvh5ss84jqgjzq81dx673sliaf7z7p60p3fxiy0fdsy"; }; }; }; @@ -655,20 +655,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-21d75bfbdfdd3581a7f97080deb98926987f14a7"; + name = "symfony-error-handler-4001f01153d0eb5496fe11d8c76d1e56b47fdb88"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7; - sha256 = "0hdcvmid17xcm21crj3k2gxvnhfww3yaw3liiqrjrkwmny9pr73q"; + url = https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88; + sha256 = "19pf2qk8nal0p59xvgvl04s2v2bcmi87wffml35qiks1pirn6znp"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-c352647244bd376bf7d31efbd5401f13f50dad0c"; + name = "symfony-event-dispatcher-047773e7016e4fd45102cedf4bd2558ae0d0c32f"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c; - sha256 = "1cxgn0y83i4qqx757kq96jadwwbc68h11snhvy175xvy8nvsmxkd"; + url = https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f; + sha256 = "1cc2lm7fwwqjvx72990k8mzb1xiprpnc1lky13bc61jipdk49jq0"; }; }; }; @@ -685,10 +685,10 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-a96bc19ed87c88eec78e1a4c803bdc1446952983"; + name = "symfony-finder-ed33314396d968a8936c95f5bd1b88bd3b3e94a3"; src = fetchurl { - url = https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983; - sha256 = "065mk0cvby82wv799gl5n4xw75nm7q32g816kily39d70rfjwzrs"; + url = https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3; + sha256 = "06m9xr0aik0y5f3j9rr0f23rwdr2b1ib55340myf0lah62as7nxm"; }; }; }; @@ -705,30 +705,30 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5"; + name = "symfony-http-foundation-8759ed5c27c2a8a47cb60f367f4be6727f08d58b"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5; - sha256 = "02dras9h0h2g3xkibvpqfly7108qhg609cv16cgmw109m9d6rv7p"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b; + sha256 = "0g47jlsz2p3np3mq4vdhj68jr7a84lwi8hifq132igzgdkbdg6ln"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-59925ee79f2541b4c6e990843e1a42768e898254"; + name = "symfony-http-kernel-e08b2fb8a6eedd81c70522e514bad9b2c1fff881"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254; - sha256 = "1v6ah9ibz6n2kdpmji1wfqzvb4cbndnwfz4hjqhhrysc0vffpbk4"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881; + sha256 = "009w87c31vp5x7hcy77g1b03avm3wp0jznxbqqvdfrid0s42zz77"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-64258e870f8cc75c3dae986201ea2df58c210b52"; + name = "symfony-mime-47dd7912152b82d0d4c8d9040dbc93d6232d472a"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52; - sha256 = "14s26zam8dxhbskizcw6mpyizg6n4i1ambq5ni6r9gv3rs6cfr9p"; + url = https://api.github.com/repos/symfony/mime/zipball/47dd7912152b82d0d4c8d9040dbc93d6232d472a; + sha256 = "1xyk50qrd5hzpwp795adbc56pqxljy3yalsd7p2bfyhd1y5ihwdv"; }; }; }; @@ -815,20 +815,20 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-f5481b22729d465acb1cea3455fc04ce84b0148b"; + name = "symfony-process-7e812c84c3f2dba173d311de6e510edf701685a8"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b; - sha256 = "1cz0gd7lkp07dlylf8c32fjpfsm9z3d66iwx45i7b5wh5gc96ns0"; + url = https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8; + sha256 = "1bayw4mnjxqr94y0w0mk1ch5ynvyz71v2hlxlp7w6xw15m9ccpsk"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-b42c3631fd9e3511610afb2ba081ea7e38d9fa38"; + name = "symfony-routing-3a3c2f197ad0846ac6413225fc78868ba1c61434"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38; - sha256 = "167lvg9n8qvgkz7hgx8hv7a53j4shqiriir03g5qz7zhvddlk7vp"; + url = https://api.github.com/repos/symfony/routing/zipball/3a3c2f197ad0846ac6413225fc78868ba1c61434; + sha256 = "0wbd206gn64q89kiz3fvpcynmpfrjrj081l5lfab0rfj50m80q4h"; }; }; }; @@ -845,10 +845,10 @@ let "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-424d29dfcc15575af05196de0100d7b52f650602"; + name = "symfony-translation-2f7fa60b8d10ca71c30dc46b0870143183a8f131"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602; - sha256 = "0fpbhbiix0yqvbq5iv5wy7b37wsfgnsay0g1292s339dil60i6a6"; + url = https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131; + sha256 = "0nhljcj0bmkdx5xsyyxyj32hdl2lirypr5yyy2n9w16bal9fxmc9"; }; }; }; @@ -865,10 +865,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"; + name = "symfony-var-dumper-a586efdf2aa832d05b9249e9115d24f6a2691160"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7; - sha256 = "0wccbr4l03asdar89bss3fhy486wjjqgjsk5iypmxaiga12ac01b"; + url = https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160; + sha256 = "12wnz5hrqcml2l28f1b5949rcvadhc8vigqcg9sqbkzzhxn6gli1"; }; }; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5a3301040d3..72ea8a943dc 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -9,13 +9,13 @@ }: let - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk="; + sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M="; }; runtimeDeps = [ @@ -64,7 +64,6 @@ let }); in stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { - inherit name pname version src meta; pluginName = if name != null then name else "${pname}-${version}"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' @@ -151,6 +150,7 @@ let brotli procps nodePackages.uglify-js + nodePackages.terser ]; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index e6640cbbe97..f64fbb137df 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -3,10 +3,10 @@ let callPackage = newScope args; in { - discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; - discourse-solved = callPackage ./discourse-solved {}; discourse-canned-replies = callPackage ./discourse-canned-replies {}; - discourse-math = callPackage ./discourse-math {}; discourse-github = callPackage ./discourse-github {}; + discourse-math = callPackage ./discourse-math {}; + discourse-solved = callPackage ./discourse-solved {}; + discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; discourse-yearly-review = callPackage ./discourse-yearly-review {}; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 05c153cd70b..558abec36f4 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-canned-replies"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "7ee748f18a276aca42185e2079c1d4cadeecdaf8"; - sha256 = "0j10kxfr6v2rdd58smg2i7iac46z74qnnjk8b91jd1svazhis1ph"; + rev = "e3f1de8928df5955b64994079b7e2073556e5456"; + sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-canned-replies"; + maintainers = with maintainers; [ talyz ]; + license = licenses.gpl2Only; + description = "Adds support for inserting a canned reply into the composer window via a UI"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index f0205f4ff1d..7c0e7f435ae 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -1,3 +1,9 @@ -source 'https://rubygems.org' +# frozen_string_literal: true + +source "https://rubygems.org" + +git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } + +# gem "rails" gem 'sawyer', '0.8.2' gem 'octokit', '4.21.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index f28833a35c0..0486ea1402b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,21 +1,25 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.4.2) + faraday (1.5.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) + faraday-patron (1.0.0) multipart-post (2.1.1) octokit (4.21.0) faraday (>= 0.9) @@ -27,11 +31,11 @@ GEM faraday (> 0.8, < 2.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES octokit (= 4.21.0) sawyer (= 0.8.2) BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index e5d8cff0a9f..bb6d16bfe46 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -1,4 +1,4 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-github"; @@ -6,7 +6,14 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "151e353a5a1971157c70c2e2b0f56387f212a81f"; - sha256 = "00kra6zd2k1f2vwcdvxnxnammzh72f5qxcqbb94m0z6maj598wdy"; + rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c"; + sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw"; }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-github"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Adds GitHub badges and linkback functionality"; + }; + } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index bad1f962957..ae20ec89521 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,21 +5,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; type = "gem"; }; - version = "1.4.2"; + version = "1.5.0"; }; faraday-em_http = { groups = ["default"]; @@ -51,6 +51,16 @@ }; version = "1.1.0"; }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -71,6 +81,16 @@ }; version = "1.1.0"; }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; multipart-post = { groups = ["default"]; platforms = []; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 8cf2a4abc0d..0e751c1dc54 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-math"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "143ddea4558ea9a1b3fd71635bc11e055763c8e7"; - sha256 = "18pq5ybl3g34i39cpixc3nszvq8gx5yji58zlbbl6428mm011cbx"; + rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276"; + sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-math"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Official MathJax support for Discourse"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index c382a83d089..2d451418bdd 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-solved"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "179611766d53974308e6f7def21836997c3c55fc"; - sha256 = "sha256:1s77h42d3bv2lqw33akxh8ss482vxnz4d7qz6xicwqfwv34qjf03"; + rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf"; + sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-solved"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Allow accepted answers on topics"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 8eba43e47e4..da47dbf182c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-spoiler-alert"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "e200cfa571d252cab63f3d30d619b370986e4cee"; - sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33"; + rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4"; + sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-spoiler-alert"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Hide spoilers behind the spoiler-alert jQuery plugin"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 8e76123ae59..b20e16118c7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -1,11 +1,17 @@ -{ mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { name = "discourse-yearly-review"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "d1471bdb68945f55342e72e2c525b4f628419a50"; - sha256 = "sha256:0xpl0l1vpih8xzb6y7k1lm72nj4ya99378viyhqfvpwzsn5pha2a"; + rev = "95149df2282d62eebeb265b4895df15a2b259d03"; + sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7"; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-yearly-review"; + maintainers = with maintainers; [ talyz ]; + license = licenses.mit; + description = "Publishes an automated Year in Review topic"; }; } diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index af968cdf331..1f7a3641caa 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -186,11 +186,6 @@ GEM jwt (2.2.3) kgio (2.11.3) libv8-node (15.14.0.1) - libv8-node (15.14.0.1-arm64-darwin-20) - libv8-node (15.14.0.1-x86_64-darwin-18) - libv8-node (15.14.0.1-x86_64-darwin-19) - libv8-node (15.14.0.1-x86_64-darwin-20) - libv8-node (15.14.0.1-x86_64-linux) listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -214,7 +209,7 @@ GEM rack (>= 1.1.3) method_source (1.0.0) mini_mime (1.1.0) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) mini_racer (0.4.0) libv8-node (~> 15.14.0.0) mini_scheduler (0.13.0) @@ -232,7 +227,7 @@ GEM multipart-post (2.1.1) mustache (1.1.1) nio4r (2.5.7) - nokogiri (1.11.5) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.5) @@ -267,7 +262,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (2.2.15) + onebox (2.2.17) addressable (~> 2.7.0) htmlentities (~> 4.3) multi_json (~> 1.11) @@ -465,12 +460,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - arm64-darwin-20 ruby - x86_64-darwin-18 - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-linux DEPENDENCIES actionmailer (= 6.1.3.2) @@ -600,4 +590,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.2.16 + 2.2.20 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 974df1ed4ea..2fe2587d25f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1135,10 +1135,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; mini_racer = { dependencies = ["libv8-node"]; @@ -1284,10 +1284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.5"; + version = "1.11.7"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -1414,10 +1414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a76xmwikcg2lv8k2cawzhmi2hx7j145v12mbpriby6zff797z4g"; + sha256 = "1swlysqwfc6mb7smv52yv12sd79dchjf2f6r738wrag0wp5hazqy"; type = "gem"; }; - version = "2.2.15"; + version = "2.2.17"; }; openssl = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index c401ab552bb..ae4dadfc3a7 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler nix-update python3 python3Packages.requests python3Packages.click python3Packages.click-log +#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log import click import click_log @@ -8,17 +8,22 @@ import tempfile import re import logging import subprocess -import pathlib +import os +import stat +import json +import requests from distutils.version import LooseVersion +from pathlib import Path from typing import Iterable -import requests logger = logging.getLogger(__name__) class DiscourseRepo: version_regex = re.compile(r'^v\d+\.\d+\.\d+$') + _latest_commit_sha = None + def __init__(self, owner: str = 'discourse', repo: str = 'discourse'): self.owner = owner self.repo = repo @@ -35,6 +40,15 @@ class DiscourseRepo: versions.sort(key=lambda x: LooseVersion(x.replace('v', '')), reverse=True) return versions + @property + def latest_commit_sha(self) -> str: + if self._latest_commit_sha is None: + r = requests.get(f'https://api.github.com/repos/{self.owner}/{self.repo}/commits?per_page=1') + r.raise_for_status() + self._latest_commit_sha = r.json()[0]['sha'] + + return self._latest_commit_sha + @staticmethod def rev2version(tag: str) -> str: """ @@ -57,19 +71,23 @@ class DiscourseRepo: def _call_nix_update(pkg, version): """calls nix-update from nixpkgs root dir""" - nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' + nixpkgs_path = Path(__file__).parent / '../../../../' return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) +def _nix_eval(expr: str): + nixpkgs_path = Path(__file__).parent / '../../../../' + return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True)) + + def _get_current_package_version(pkg: str): - nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' - return subprocess.check_output(['nix', 'eval', '--raw', f'nixpkgs.{pkg}.version'], text=True) + return _nix_eval(f'{pkg}.version') def _diff_file(filepath: str, old_version: str, new_version: str): repo = DiscourseRepo() - current_dir = pathlib.Path(__file__).parent + current_dir = Path(__file__).parent old = repo.get_file(filepath, 'v' + old_version) new = repo.get_file(filepath, 'v' + new_version) @@ -148,17 +166,87 @@ def update(rev): version = repo.rev2version(rev) logger.debug(f"Using version {version}") - rubyenv_dir = pathlib.Path(__file__).parent / "rubyEnv" + rubyenv_dir = Path(__file__).parent / "rubyEnv" for fn in ['Gemfile.lock', 'Gemfile']: with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) + for platform in ['arm64-darwin-20', 'x86_64-darwin-18', + 'x86_64-darwin-19', 'x86_64-darwin-20', + 'x86_64-linux']: + subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) _call_nix_update('discourse', repo.rev2version(rev)) +@cli.command() +def update_plugins(): + """Update plugins to their latest revision. + + """ + plugins = [ + {'name': 'discourse-canned-replies'}, + {'name': 'discourse-github'}, + {'name': 'discourse-math'}, + {'name': 'discourse-solved'}, + {'name': 'discourse-spoiler-alert'}, + {'name': 'discourse-yearly-review'}, + ] + + for plugin in plugins: + fetcher = plugin.get('fetcher') or "fetchFromGitHub" + owner = plugin.get('owner') or "discourse" + name = plugin.get('name') + repo_name = plugin.get('repo_name') or name + + repo = DiscourseRepo(owner=owner, repo=repo_name) + prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev') + + if prev_commit_sha == repo.latest_commit_sha: + click.echo(f'Plugin {name} is already at the latest revision') + continue + + filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file'] + prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash') + new_hash = subprocess.check_output([ + 'nix-universal-prefetch', fetcher, + '--owner', owner, + '--repo', repo_name, + '--rev', repo.latest_commit_sha, + ], text=True).strip("\n") + + click.echo(f"Update {name}, {prev_commit_sha} -> {repo.latest_commit_sha} in {filename}") + + with open(filename, 'r+') as f: + content = f.read() + content = content.replace(prev_commit_sha, repo.latest_commit_sha) + content = content.replace(prev_hash, new_hash) + f.seek(0) + f.write(content) + f.truncate() + + rubyenv_dir = Path(filename).parent + gemfile = rubyenv_dir / "Gemfile" + gemfile_text = '' + for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines(): + if 'gem ' in line: + gemfile_text = gemfile_text + line + os.linesep + + if len(gemfile_text) > 0: + if os.path.isfile(gemfile): + os.remove(gemfile) + + subprocess.check_output(['bundle', 'init'], cwd=rubyenv_dir) + os.chmod(gemfile, stat.S_IREAD | stat.S_IWRITE | stat.S_IRGRP | stat.S_IROTH) + + with open(gemfile, 'a') as f: + f.write(gemfile_text) + + subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir) + subprocess.check_output(['bundix'], cwd=rubyenv_dir) + if __name__ == '__main__': cli() diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 125c329c4bd..9a75403cec6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { pname = "xorg-server"; - version = "1.20.11"; + version = "1.20.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2"; - sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz"; + sha256 = "1b4ckvxaiiiwdxwyfzbbfkr384qqy5qzfsm37z0fr08x8f9w0v9k"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7e8eee77a08..a52e1a7b0a5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -659,6 +659,7 @@ self: super: "--with-xkb-output=$out/share/X11/xkb/compiled" "--with-log-dir=/var/log" "--enable-glamor" + "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise ] ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-tls" ]; @@ -781,7 +782,7 @@ self: super: # don't unset DBUS_SESSION_BUS_ADDRESS in startx (fetchpatch { name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/fs46369.patch?h=packages/xorg-xinit&id=40f3ac0a31336d871c76065270d3f10e922d06f3"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/40f3ac0a31336d871c76065270d3f10e922d06f3/trunk/fs46369.patch"; sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; }) ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 4bb1867903e..42cb2da3a0d 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index 25065b21fb1..8d1a14e19f2 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - sha256 = "NFysKzRZgDXXZW/sUlZNu7ZpMCKwbjAhIfspSK3UqCY="; + sha256 = "Xld66z9vVp3kxikndZ9k/zlNvP0YSoSCNTBkJ8rT3uo="; }; checkPlugins = [ fishtape ]; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 4844d3fcbf2..07d72a6b436 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c="; + sha256 = "sha256-Vn8NzpvJ1W/+UUuhr1plLqskVBUOFJHvy+hxKE3DmIs="; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index a15c9b5bbb9..0ba449870b8 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-fnk4lLRASX7FFAovAiRd9sm4jNlnFIJ78UCzdsXYVfM="; + sha256 = "sha256-6j6QZtsA5ZgfXthYjXRrND2zAJwZx0/6WRI1f3c+2mE="; }; installPhase = '' diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index eb389f4051f..03e4f346155 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -4,4 +4,5 @@ lib.recurseIntoAttrs { shellFor = callPackage ./shellFor { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; + writers = callPackage ./writers { }; } diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f26..e3214fb49fe 100644 --- a/pkgs/test/haskell/documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -4,7 +4,11 @@ let drv = haskellPackages.vector; docs = pkgs.haskell.lib.documentationTarball drv; -in pkgs.runCommand "test haskell.lib.documentationTarball" { } '' +in pkgs.runCommand "test haskell.lib.documentationTarball" { + meta = { + inherit (docs.meta) platforms; + }; +} '' tar xvzf "${docs}/${drv.name}-docs.tar.gz" # Check for Haddock html diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index b1335e2a74c..5a8391d0886 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -30,7 +30,12 @@ let fi ''; -in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' +in +pkgs.runCommand "test haskell.lib.setBuildTarget" { + meta = { + inherit (drv.meta) platforms; + }; +} '' ${test "foo" "bar"} ${test "bar" "foo"} touch "$out" diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 37ad2e90d89..04f5e045361 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -29,5 +29,8 @@ additionalMaintainers = with lib.maintainers; [ cdepillabout ]; allMaintainers = oldMaintainers ++ additionalMaintainers; in - oldMeta // { maintainers = allMaintainers; }; + oldMeta // { + maintainers = allMaintainers; + inherit (cabal-install.meta) platforms; + }; }) diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix new file mode 100644 index 00000000000..f05fda4bc73 --- /dev/null +++ b/pkgs/test/haskell/writers/default.nix @@ -0,0 +1,26 @@ +# Wrap only the haskell-related tests from tests.writers +# in their own derivation for Hydra CI in the haskell-updates +# jobset. Can presumably removed as soon as tests.writers is +# always green on darwin as well: +# https://github.com/NixOS/nixpkgs/issues/126182 +{ runCommand, tests }: + +let + inherit (tests.writers) + writeTest + bin + simple + path + ; +in + +runCommand "test-haskell-writers" { + meta = { + inherit (tests.writers.meta) platforms; + }; +} '' + ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} + ${writeTest "success" "test-haskell-simple-writer" simple.haskell} + ${writeTest "success" "test-haskell-path-writer" path.haskell} + touch $out +'' diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 86c0a7f795b..2444334f526 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -119,4 +119,49 @@ texdoc --debug --list texdoc | tee "$out" grep texdoc.pdf "$out" ''; + + # test that language files are generated as expected + hyphen-base = runCommandNoCC "texlive-test-hyphen-base" { + hyphenBase = lib.head texlive.hyphen-base.pkgs; + schemeFull = texlive.combined.scheme-full; + schemeInfraOnly = texlive.combined.scheme-infraonly; + } '' + mkdir -p "$out"/{scheme-infraonly,scheme-full} + + # create language files with no hyphenation patterns + cat "$hyphenBase"/tex/generic/config/language.us >language.dat + cat "$hyphenBase"/tex/generic/config/language.us.def >language.def + cat "$hyphenBase"/tex/generic/config/language.us.lua >language.dat.lua + + cat >>language.dat.lua <<EOF + } + EOF + + cat >>language.def <<EOF + %%% No changes may be made beyond this point. + + \uselanguage {USenglish} %%% This MUST be the last line of the file. + EOF + + for fname in language.{dat,def,dat.lua} ; do + diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \ + {"$hyphenBase","$schemeFull"/share/texmf}/tex/generic/config/"$fname" \ + | tee "$out/scheme-full/$fname.patch" + diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \ + {,"$schemeInfraOnly"/share/texmf/tex/generic/config/}"$fname" \ + | tee "$out/scheme-infraonly/$fname.patch" + done + ''; + + # test that fmtutil.cnf is fully regenerated on scheme-full + fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { + kpathsea = lib.head texlive.kpathsea.pkgs; + schemeFull = texlive.combined.scheme-full; + } '' + mkdir -p "$out" + + diff --ignore-matching-lines='^# Generated by ' -u \ + {"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \ + | tee "$out/fmtutil.cnf.patch" + ''; } diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix new file mode 100644 index 00000000000..c03d4443fcf --- /dev/null +++ b/pkgs/tools/X11/sx/default.nix @@ -0,0 +1,30 @@ +{ coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: + +stdenv.mkDerivation rec { + pname = "sx"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "earnestly"; + repo = pname; + rev = version; + sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/sx \ + --prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} + ''; + + meta = with lib; { + description = "Simple alternative to both xinit and startx for starting a Xorg server"; + homepage = "https://github.com/earnestly/sx"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 362a86fff37..5974b2bd3d5 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake -, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk , xorg , opencl-headers, opencl-clhpp, ocl-icd }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg_turbo libGL libGLU fltk - libX11 libXv libXtst xorg.xcbutilkeysyms + libXv libXtst libXi xorg.xcbutilkeysyms opencl-headers opencl-clhpp ocl-icd ]; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 0a01a3dad5a..19a464aff72 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ glib.dev ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 758450d3654..61e48de7f5e 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure.ac \ - --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])" + --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])" ''; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 9af721f02e5..0bfedc2f036 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; + sha256 = "sha256-Wa6uvoAsPuswcrPgkLb8qTDEbUyeSeRSIO5t9z5/dqY="; }; vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 477bac87b9a..b37f3ce465e 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.35.1"; + version = "1.36.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RF0ZLcQNBVEExzSaOBM9EbqP1wuY8yIWYV8uabyc40o="; + sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index fde3e829cc1..ac831c9da48 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -19,13 +19,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.15"; + version = "4.16"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU="; + sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r"; }; postPatch = '' @@ -40,6 +40,9 @@ buildGoPackage rec { cp -r _dist/src/* ../../.. popd + # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939 + export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" + makeFlagsArray+=("-tags libsqlite3") ''; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 9507096335a..f69909d8546 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.18.3"; + version = "0.19.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YQYDDg4rgLygswGl/IYb+USSsuXQ8kXh4NhQYvnaCko="; + sha256 = "sha256-oiaH0w7TEztR1i0wBuXXr+JN37UZOQ/zObBzQQvAnZY="; }; - vendorSha256 = "sha256-f1un8jWhx7VfbbYV0/t3SLFXp496Wt5aEHkcuj/U4KQ="; + vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY="; excludedPackages = "misc"; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 8ba87da6b6a..96f9262427b 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "17.04"; src = fetchFromGitHub { - owner = "szcnick"; + owner = "jinfeihan57"; repo = pname; rev = "v${version}"; sha256 = "sha256-19F4hPV0nKVuFZNbOcXrcA1uW6Y3HQolaHVIYXGmh18="; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = "https://github.com/szcnick/p7zip"; + homepage = "https://github.com/jinfeihan57/p7zip"; description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.raskin ]; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 0e57e19a288..d80ad9b0dc0 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -12,25 +12,24 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.15.1 +# https://github.com/coqui-ai/TTS/releases/tag/v0.1.2 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.15.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0z6sbzspgmw5ja8r2zysyhdk4jzlv88a0ihkvxvvwxslkyncdb89"; + sha256 = "1qgiaqn7iqxyf54qgnpmli69nw9s3gmi9qv874jsgycykc10hjg4"; }; postPatch = '' sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt - sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt sed -i -e 's!numba==[^"]*!numba!' requirements.txt sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt @@ -44,6 +43,7 @@ python3Packages.buildPythonApplication rec { anyascii coqpit flask + gruut gdown inflect jieba diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index d0e48454a36..ce7887ff0fb 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -1,33 +1,53 @@ -{ lib, stdenv, python3, fetchpatch, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: +{ lib +, stdenv +, acl +, e2fsprogs +, libb2 +, lz4 +, openssh +, openssl +, python3 +, zstd +, nixosTests +}: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.16"; + version = "1.1.17"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; + sha256 = "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"; }; - patches = [ - # fix compatibility with sphinx 4 - (fetchpatch { - url = "https://github.com/borgbackup/borg/commit/6a1f31bf2914d167e2f5051f1d531d5d4a19f54b.patch"; - includes = [ "docs/conf.py" ]; - sha256 = "0aa4kyb3j4apgwqcy1hzg6lxvpf60m2mijcj60vh101b42410hiz"; - }) - ]; + postPatch = '' + # sandbox does not support setuid/setgid/sticky bits + substituteInPlace src/borg/testsuite/archiver.py \ + --replace "0o4755" "0o0755" + ''; nativeBuildInputs = with python3.pkgs; [ setuptools-scm # For building documentation: - sphinx guzzle_sphinx_theme + sphinx + guzzle_sphinx_theme ]; + buildInputs = [ - libb2 lz4 zstd openssl - ] ++ lib.optionals stdenv.isLinux [ acl ]; + libb2 + lz4 + zstd + openssl + ] ++ lib.optionals stdenv.isLinux [ + acl + ]; + propagatedBuildInputs = with python3.pkgs; [ - cython llfuse + cython + llfuse + packaging + ] ++ lib.optionals (!stdenv.isDarwin) [ + pyfuse3 ]; preConfigure = '' @@ -61,15 +81,36 @@ python3.pkgs.buildPythonApplication rec { ''; checkInputs = with python3.pkgs; [ - pytest + e2fsprogs + pytest-benchmark + pytest-xdist + pytestCheckHook ]; - checkPhase = '' - HOME=$(mktemp -d) py.test --pyargs borg.testsuite - ''; + pytestFlagsArray = [ + "--numprocesses" "auto" + "--benchmark-skip" + "--pyargs" "borg.testsuite" + ]; - # 64 failures, needs pytest-benchmark - doCheck = false; + disabledTests = [ + # fuse: device not found, try 'modprobe fuse' first + "test_fuse" + "test_fuse_allow_damaged_files" + "test_fuse_mount_hardlinks" + "test_fuse_mount_options" + "test_fuse_versions_view" + "test_readonly_mount" + # Error: Permission denied while trying to write to /var/{,tmp} + "test_get_cache_dir" + "test_get_keys_dir" + "test_get_security_dir" + "test_get_config_dir" + ]; + + preCheck = '' + export HOME=$TEMP + ''; passthru.tests = { inherit (nixosTests) borgbackup; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 0d24e3df720..3307ba08b11 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,23 +1,36 @@ -{lib, fetchurl, python2Packages, librsync, gnused }: +{ lib, python3Packages, librsync }: -python2Packages.buildPythonApplication { - name = "rdiff-backup-1.3.3"; +let + pypkgs = python3Packages; - src = fetchurl { - url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz"; - sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; +in +pypkgs.buildPythonApplication rec { + pname = "rdiff-backup"; + version = "2.0.5"; + + src = pypkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s="; }; - patches = [ ./fix-librsync-rs_default_strong_len.patch ]; + # pkg_resources fails to find the version and then falls back to "DEV" + postPatch = '' + substituteInPlace src/rdiff_backup/Globals.py \ + --replace 'version = "DEV"' 'version = "${version}"' + ''; + + buildInputs = [ librsync ]; - buildInputs = [ librsync gnused ]; + nativeBuildInputs = with pypkgs; [ setuptools-scm ]; + # no tests from pypi doCheck = false; - meta = { + meta = with lib; { description = "Backup system trying to combine best a mirror and an incremental backup system"; - homepage = "http://rdiff-backup.nongnu.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.all; + homepage = "https://rdiff-backup.net"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch b/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch deleted file mode 100644 index ce23c8a8124..00000000000 --- a/pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with -librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be -found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity). - ---- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100 -+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100 -@@ -59,8 +59,13 @@ - if (sm == NULL) return NULL; - sm->x_attr = NULL; - -+#ifdef RS_DEFAULT_STRONG_LEN - sm->sig_job = rs_sig_begin((size_t)blocklen, - (size_t)RS_DEFAULT_STRONG_LEN); -+#else -+ sm->sig_job = rs_sig_begin((size_t)blocklen, -+ (size_t)8, RS_MD4_SIG_MAGIC); -+#endif - return (PyObject*)sm; - } - diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 8112b0971f3..5371e8d526b 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -6,7 +6,7 @@ in symlinkJoin { name = "brasero-${brasero-original.version}"; paths = [ brasero-original ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/brasero \ diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 4072dd43aef..ad36ebb81de 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; preConfigure = '' + substituteInPlace configure.ac --replace 'AC_PREREQ([2.63])' 'AC_PREREQ(2.64)' ./build-aux/autogen.sh ''; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index ac6481cc625..3d7608ac094 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = "https://git.archlinux.org/svntogit/community.git/plain/cuneiform/trunk/build-fix.patch?id=a2ec92f05de006b56d16ac6a6c370d54a554861a"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/a2ec92f05de006b56d16ac6a6c370d54a554861a/cuneiform/trunk/build-fix.patch"; sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj"; }) ]; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index b9784a85b2d..1f72243293e 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -1,25 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.4.2"; + version = "0.5.3"; - src = fetchFromGitHub { - owner = "ivanceras"; - repo = pname; - rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; - sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; + src = fetchCrate { + inherit version; + crateName = "svgbob_cli"; + sha256 = "1gi8h4wzpi477y1gwi4708pn2kr65934a4dmphbhwppxbw447qiw"; }; - sourceRoot = "source/svgbob_cli"; - postPatch = '' - substituteInPlace ../svgbob/src/lib.rs \ - --replace '#![deny(warnings)]' "" - ''; - cargoSha256 = "1jyycr95gjginx6bzmay9b5dbpnbwdqbv13w1qy58znicsmh3v8a"; - - # Test tries to build outdated examples - doCheck = false; + cargoSha256 = "1x8phpllwm12igaachghwq6wgxl7nl8bhh7xybfrmn447viwxhq2"; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 28a08e39b22..6e7e71c5713 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx \ diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/tools/misc/afetch/default.nix new file mode 100644 index 00000000000..aea2ff1ff2b --- /dev/null +++ b/pkgs/tools/misc/afetch/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "afetch"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "13-CF"; + repo = "afetch"; + rev = "V${version}"; + sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A fetch program written in C"; + homepage = "https://github.com/13-CF/afetch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 jk ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 8bc82547eeb..81b910117f1 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , nixosTests , rustPlatform , fetchFromGitHub @@ -12,16 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; + sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; }; - - cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; + cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 - installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{bash,fish,zsh} ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 5e91756413e..d6ee1720430 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.203"; + version = "1.204"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-jQJC3b+HsEeKYRKQUfI2w3xYDJHs9ajfN8lb6Upzgd8="; + sha256 = "sha256-oyBkt52mWM2FiaM++s5Uoe7Wd0v1oLM7HjWKDjIonGE="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix index f75f3a6f822..6a20ebc10c5 100644 --- a/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "betterdiscordctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "1wys3wbcz5hq8275ia2887kr5fzz4b3gkcp56667j9k0p3k3zfac"; + sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc"; }; postPatch = '' @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/betterdiscordctl --version + ''; + meta = with lib; { homepage = "https://github.com/bb010g/betterdiscordctl"; description = "A utility for managing BetterDiscord on Linux"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index ca5f99f3b62..758a42d1538 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse libnl ]; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; preConfigure = '' # Must be an absolute path @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor pSub ]; }; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 5d9790ec2be..a0aed739c2a 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; + sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU="; }; - vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; + vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; doCheck = false; diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index dfad9569d2a..741487c6687 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -2,24 +2,24 @@ buildGoModule rec { pname = "cod"; - version = "unstable-2020-09-10"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dim-an"; repo = pname; - rev = "ae68da08339471dd278d6df79abbfd6fe89a10fe"; - sha256 = "1l3gn9v8dcy72f5xq9hwbkvkis0vp4dp8qyinsrii3acmhksg9v6"; + rev = "v${version}"; + sha256 = "0wi680sxpv0kp1ggy21qp4c4ms79hw4z9w9kvp278p8z3y8wwglr"; }; - vendorSha256 = "1arllkiz1hk12hq5b2zpg3f8i9lxl66mil5sdv8gnhflmb37vbv3"; + vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i"; - buildFlagsArray = [ "-ldflags=-s -w -X main.GitSha=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; doCheck = false; meta = with lib; { - description = "Tool for generating Bash/Zsh autocompletions based on `--help` output"; - homepage = src.meta.homepage; + description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; + homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b7d0f2c3aad..2a85c0dc2b8 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { ddccontrol-db ]; + configureFlags = [ + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + ]; + prePatch = '' oldPath="\$""{datadir}/ddccontrol-db" newPath="${ddccontrol-db}/share/ddccontrol-db" diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 945af40a717..37c37de8399 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -8,9 +8,13 @@ }: let - esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + python = python3.override { + packageOverrides = self: super: { + esphome-dashboard = pkgs.callPackage ./dashboard.nix {}; + }; + }; in -python3.pkgs.buildPythonApplication rec { +with python.pkgs; buildPythonApplication rec { pname = "esphome"; version = "1.19.4"; @@ -49,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { # They have validation functions like: # - validate_cryptography_installed # - validate_pillow_installed - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ click colorama cryptography @@ -73,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - checkInputs = with python3.pkgs; [ + checkInputs = [ hypothesis mock pytest-asyncio @@ -82,6 +86,13 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; + disabledTestPaths = [ + # requires hypothesis 5.49, we have 6.x + # ImportError: cannot import name 'ip_addresses' from 'hypothesis.provisional' + "tests/unit_tests/test_core.py" + "tests/unit_tests/test_helpers.py" + ]; + postCheck = '' $out/bin/esphome --help > /dev/null ''; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index de2b809eea5..69b76cf648d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; + sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw="; }; - patches = [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -44,8 +42,7 @@ stdenv.mkDerivation rec { libsodium xz zlib - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ DiskArbitration ]; diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch deleted file mode 100644 index b04b436ff5b..00000000000 --- a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/common-orig.sh b/tests/common.sh -index 1f2673f..79dcf74 100755 ---- a/tests/common-orig.sh -+++ b/tests/common.sh -@@ -21,20 +21,6 @@ else - fi - - case "$HOST_OS" in -- Darwin) -- # BSD stat -- STAT_FILESIZE_FLAGS="-f %z" -- -- # Not -d? -- BASE64_DECODE=-D -- -- READLINK=/usr/local/bin/greadlink -- [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 ) -- [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 ) -- -- FSCK_FAT=fsck_msdos -- TIMEOUT=gtimeout -- ;; - FreeBSD|NetBSD|OpenBSD|DragonFly) - # BSD stat - STAT_FILESIZE_FLAGS="-f %z" diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index fcf29beb188..d9c4ceeca2c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -39,7 +39,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.06-rc1"; + version = "2.06"; in ( @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; + sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f"; }; patches = [ diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 6d747bf8c6e..2371bdb0e05 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { ++ map fetchurl (import ./grub1.patches.nix) ; + preConfigure = '' + substituteInPlace ./configure.ac --replace 'AC_PREREQ(2.61)' 'AC_PREREQ(2.64)' + ''; + # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index 3f11490fcc4..dcab5f249fe 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "hexyl"; - version = "0.8.0"; + pname = "hexyl"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm"; + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hLDx5OzCE5iA492V3+dhaav2l8/rOVWyskrU4Gz1hf4="; }; - cargoSha256 = "08hn0csw12xaag95gb5rj4q7k2zyy9j9bf4iw3b0r3ndh66qqra2"; + cargoSha256 = "sha256-CGaCMrShagK4dAdwJtaeUMJlYOlG/cH+6E1QDYGrqL0="; meta = with lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; @@ -22,9 +22,8 @@ rustPlatform.buildRustPackage rec { printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII). ''; - homepage = "https://github.com/sharkdp/hexyl"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/sharkdp/hexyl"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index ac64fe9e8bc..e43ab2ae879 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, lib, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}: stdenv.mkDerivation rec { - name = "idutils-4.6"; + pname = "idutils"; + version = "4.6"; src = fetchurl { - url = "mirror://gnu/idutils/${name}.tar.xz"; + url = "mirror://gnu/idutils/idutils-${version}.tar.xz"; sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; - preConfigure = - '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in idutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h + preConfigure = '' + # replace embedded gnulib tests with those from gnulib package + bash -O extglob -c "cd gnulib-tests; rm -r !(Makefile.am)" + substituteInPlace ./configure.ac --replace "AC_PREREQ(2.61)" "AC_PREREQ(2.64)" + ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; buildInputs = lib.optional stdenv.isLinux emacs; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ]; doCheck = !stdenv.isDarwin; patches = [ ./nix-mapping.patch ]; - meta = { + meta = with lib; { description = "Text searching utility"; longDescription = '' @@ -46,10 +48,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ gfrascadorio ]; platforms = lib.platforms.all; - broken = true; }; } diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 764e9ff5d77..3d91dd6d9ab 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -1,25 +1,58 @@ -{ lib, buildGoModule, fetchFromGitHub, terraform }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, terraform }: buildGoModule rec { pname = "infracost"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw="; + sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE="; }; - vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8="; + ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; + + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; + checkInputs = [ terraform ]; - checkPhase = "make test"; + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + postInstall = '' + export INFRACOST_SKIP_UPDATE_CHECK=true + installShellCompletion --cmd infracost \ + --bash <($out/bin/infracost completion --shell bash) \ + --fish <($out/bin/infracost completion --shell fish) \ + --zsh <($out/bin/infracost completion --shell zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export INFRACOST_SKIP_UPDATE_CHECK=true + $out/bin/infracost --help + $out/bin/infracost --version | grep "v${version}" + + runHook postInstallCheck + ''; meta = with lib; { + homepage = "https://infracost.io"; + changelog = "https://github.com/infracost/infracost/releases/tag/v${version}"; description = "Cloud cost estimates for Terraform in your CLI and pull requests"; - homepage = "https://github.com/infracost/infracost"; - license = [ licenses.asl20 ]; - maintainers = [ maintainers.davegallant ]; + longDescription = '' + Infracost shows hourly and monthly cost estimates for a Terraform project. + This helps developers, DevOps et al. quickly see the cost breakdown and + compare different deployment options upfront. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ davegallant jk ]; }; } diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 641e86c22c4..4be0b3d417e 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, perl, cdrkit, xz, openssl, gnu-efi, mtools +, syslinux ? null , embedScript ? null , additionalTargets ? {} }: @@ -8,12 +9,20 @@ let "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; - } // { + } // lib.optionalAttrs (stdenv.isi686 || stdenv.isx86_64) { "bin/ipxe.dsk" = null; "bin/ipxe.usb" = null; "bin/ipxe.iso" = null; "bin/ipxe.lkrn" = null; "bin/undionly.kpxe" = null; + } // lib.optionalAttrs stdenv.isAarch32 { + "bin-arm32-efi/ipxe.efi" = null; + "bin-arm32-efi/ipxe.efirom" = null; + "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + } // lib.optionalAttrs stdenv.isAarch64 { + "bin-arm64-efi/ipxe.efi" = null; + "bin-arm64-efi/ipxe.efirom" = null; + "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; }; in @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { pname = "ipxe"; version = "1.21.1"; - nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; + nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) syslinux; src = fetchFromGitHub { owner = "ipxe"; @@ -37,6 +46,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [ "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -62,6 +72,8 @@ stdenv.mkDerivation rec { buildFlags = lib.attrNames targets; installPhase = '' + runHook preInstall + mkdir -p $out ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: if to == null @@ -71,6 +83,8 @@ stdenv.mkDerivation rec { # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. ln -s undionly.kpxe $out/undionly.kpxe.0 + + runHook postInstall ''; enableParallelBuilding = true; @@ -78,8 +92,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ehmry ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index c6f1cf8f816..a499c3eb46b 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-Ab5bY5r0tYx3JxYRRq7i9O7WFvdi6cRMSuru/pK50y8="; + sha256 = "sha256-IXbOmeWLhGOijO1xLItw1wzbHxl0Zyd0dHvfcaPWE8U="; }; - cargoSha256 = "sha256-k7jsWMFU/8XogREic4GB+qYocFtiTvSzvBAcORUFe0o="; + cargoSha256 = "sha256-2XCtjMV8ko6jnvXYtJhLlNvB1uc0QLO/aYsQX40deBk="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix new file mode 100644 index 00000000000..2babcb2bedd --- /dev/null +++ b/pkgs/tools/misc/lilo/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, fetchurl, dev86, sharutils }: + +stdenv.mkDerivation rec { + pname = "lilo"; + version = "24.2"; + src = fetchurl { + url = "https://www.joonet.de/lilo/ftp/sources/${pname}-${version}.tar.gz"; + hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE="; + }; + nativeBuildInputs = [ dev86 sharutils ]; + DESTDIR = placeholder "out"; + + meta = with lib; { + homepage = "https://www.joonet.de/lilo/"; + description = "Linux bootloader"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix deleted file mode 100644 index 0c021591e5e..00000000000 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: - -let - system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; -in -stdenv.mkDerivation rec { - pname = "ocz-ssd-guru"; - version = "1.0.1170"; - - src = fetchurl { - url = "http://ocz.com/consumer/download/ssd-guru/SSDGuru_${version}.tar.gz"; - sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - libPath = lib.makeLibraryPath [ - xorg.libX11 - xorg.libxcb - freetype - fontconfig - xorg.libXext - xorg.libXi - xorg.libXrender - stdenv.cc.cc - glibc - libGLU libGL - ]; - - installPhase = '' - mkdir -p $out/bin - cp ${system}/SSDGuru $out/bin/ - rm -rf linux{32,64} - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath:$out \ - $out/bin/SSDGuru - - wrapProgram $out/bin/SSDGuru --prefix LD_LIBRARY_PATH : $libPath - ''; - - dontStrip = true; - dontPatchELF = true; - - meta = { - homepage = "http://ocz.com/ssd-guru"; - description = "SSD Management Tool for OCZ disks"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jagajaga ]; - }; - -} diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index f5f8f87e9ca..052e6198d4f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zXXjy90oxLO/Ac/TQC4J6rOvha2qGBMv0SAAXvDyITo="; + sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj"; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-TXmV1saqZ/XS4HxKpGXWu3HuoZ3WIptSc8oTNnPCqYE="; + cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9"; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 0e91b9c0e56..5514fd4e30f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "01q03v6a2rkw49z5nbm5mghm0qmmm12pq3amsiiiv5j6m9p0fdsy"; + sha256 = "0b0q4k5aacw2nna5higr6sk5lsdn62lw2l9lccfy5s3m530banni"; }; pythonPaths = [ cryptography pyyaml requests ]; @@ -43,6 +43,13 @@ in stdenv.mkDerivation rec { sh scripts/run-tests.sh -2 ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/svtplay-dl --help > /dev/null + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites"; diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/tools/misc/tea/default.nix index 06e54559db9..a7af4fec7ba 100644 --- a/pkgs/tools/misc/tea/default.nix +++ b/pkgs/tools/misc/tea/default.nix @@ -1,11 +1,13 @@ -{ lib, buildGoModule, fetchgit }: +{ lib, buildGoModule, fetchFromGitea }: buildGoModule rec { pname = "tea"; version = "0.7.0"; - src = fetchgit { - url = "https://gitea.com/gitea/tea"; + src = fetchFromGitea { + domain = "gitea.com"; + owner = "gitea"; + repo = "tea"; rev = "v${version}"; sha256 = "sha256-Kq+A6YELfBJ04t7pPnX8Ulh4NSMFn3AHggplLD9J8MY="; }; diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 9c0a68805a6..5f6acfd9696 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.2"; + version = "0.11.5"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "sha256-FedRwFVc+m25+Elj1Vp/fInbK6DVsUpniw29/dtecWo="; + sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE="; }; - cargoSha256 = "sha256-jxXoFOwoBSkn7pv10ctLpD7ko8bokc1ADkB7NQFRC7c="; + cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 209a38cdcc1..8abfb077596 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,25 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-dnswE/DU2jCfxWW10Ctjw8woktwWZqyd3E9IuKkle1M="; + sha256 = "sha256-XI6061nCVyL8Q1s+QH75IesneJNhbhxGnILZxQCa5LU="; }; - postPatch = '' - # can be removed after https://github.com/uutils/coreutils/pull/1815 is included - substituteInPlace GNUmakefile \ - --replace uutils coreutils - ''; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-92BHPSVIPZLn399AcaJJjRq2WkxzDm8knKN3FIdAxAA="; + hash = "sha256-bfwWyeuslLjh4OCt+H8CM8hCrRFqlibOS8gS64lysa0="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 2e506376851..06e886e4d04 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -3,8 +3,7 @@ let xvfb-run = fetchurl { name = "xvfb-run"; - # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9cb733cefa92af3fca608fb051d5251160c9bbff/trunk/xvfb-run"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index bf8a1b8e4f8..184ba0862c5 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; + sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY="; }; - vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; + vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8="; outputs = [ "out" "wordlists" ]; @@ -24,6 +24,9 @@ buildGoModule rec { gzip $wordlists/*.txt ''; + # https://github.com/OWASP/Amass/issues/640 + doCheck = false; + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' @@ -37,8 +40,8 @@ buildGoModule rec { Amass ships with a set of wordlist (to be used with the amass -w flag) that are found under the wordlists output. ''; - homepage = "https://www.owasp.org/index.php/OWASP_Amass_Project"; + homepage = "https://owasp.org/www-project-amass/"; license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit fab ]; }; } diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 9ae9644eb94..9d3e4025a99 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "curlie"; - version = "1.6.0"; + version = "1.6.2"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8="; + sha256 = "sha256-2CZpqc1MnAY6M1UFakKLaqGjaifw+7bN4hxc0jWgSps="; }; vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 72daa0608a6..e4bb685b518 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { # perl packages by default get devdoc which isn't present outputs = [ "out" ]; - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP IOSocketInet6 ]; # Use iproute2 instead of ifconfig preConfigure = '' diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 5d71f9641fd..2a722d17c01 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.isc.org/dhcp/"; - license = licenses.isc; + license = licenses.mpl20; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 8383f82fd93..014cce5ea4f 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = [ net-snmp ]; + buildInputs = lib.optional stdenv.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index cee4956269e..f643702d625 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY="; + sha256 = "sha256-n+xNWhOkRCIcoBHR8u+xZK81fU0usIfFhYg3BO9yXik="; }; - cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU="; + cargoSha256 = "sha256-cTqQtJpuwVlUKfAK8ASf6vq6PU2NE8PT/el/Hz4HgtA="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index 992ee324cc5..7e2eef70b8a 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ip2unix"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "nixcloud"; repo = "ip2unix"; rev = "v${version}"; - sha256 = "19c449h60b2m1d8kawnhpi4y9y4ddm24jmlh8kilqmx8m5l2khr6"; + sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/tools/networking/n2n/default.nix new file mode 100644 index 00000000000..aec4a1c5f53 --- /dev/null +++ b/pkgs/tools/networking/n2n/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "n2n"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "ntop"; + repo = "n2n"; + rev = version; + hash = "sha256-2xJ8gYVZJZoKs6PZ/9GacgxQ+/3tmnRntT1AbPe1At4="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + postPatch = '' + patchShebangs autogen.sh + ''; + + preAutoreconf = '' + ./autogen.sh + ''; + + PREFIX = placeholder "out"; + + meta = with lib; { + description = "Peer-to-peer VPN"; + homepage = "https://www.ntop.org/products/n2n/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index fbfab8d2f05..2840b9d8400 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -9,8 +9,7 @@ let versions = builtins.fromJSON (builtins.readFile ./versions.json); else if stdenv.isAarch64 then "arm64" else throw "Unsupported architecture"; os = if stdenv.isLinux then "linux" - else if (stdenv.isDarwin && stdenv.isx86_64) then "darwin" - else if stdenv.isDarwin then throw "Unsupported architecture" + else if stdenv.isDarwin then "darwin" else throw "Unsupported os"; versionInfo = versions."${os}-${arch}"; inherit (versionInfo) version sha256 url; diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix new file mode 100644 index 00000000000..200b488cf71 --- /dev/null +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl }: + +let + pname = "ookla-speedtest"; + version = "1.0.0"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; + sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + }; + aarch64-linux = fetchurl { + url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; + sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + }; + }; +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = srcs.${stdenv.hostPlatform.system}; + + setSourceRoot = '' + sourceRoot=$PWD + ''; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + install -D speedtest $out/bin/speedtest + install -D speedtest.5 $out/share/man/man5/speedtest.5 + ''; + + meta = with lib; { + description = "Command line internet speedtest tool by Ookla"; + homepage = "https://www.speedtest.net/apps/cli"; + license = licenses.unfree; + maintainers = with maintainers; [ kranzes ]; + platforms = lib.attrNames srcs; + }; +} diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index bc3be912265..58fae3f9f15 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Fix build with openssl 1.1.0 (fetchpatch { name = "vde_cryptcab-compile-against-openssl-1.1.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b11be49997fa94b603e366064690b7cc6bce61/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch"; sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; }) ] ++ lib.optional stdenv.hostPlatform.isMusl [ diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 07b7a8441b8..d512b03dbea 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { # Cargo-culted from Arch, returns “out of pty's” without it (fetchurl { name = "fix_use_ptmx_on_arch.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0a7c92543f9309856d02e31196f06d7c3eaa8b67/trunk/fix_use_ptmx_on_arch.patch"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 0345830fb9d..f56222f403a 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -1,17 +1,33 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub +, makeWrapper +, nix +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk="; }; - cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5"; + cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0="; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + # needed for nix-prefetch-url + postInstall = '' + wrapProgram $out/bin/nix-template \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; meta = with lib; { description = "Make creating nix expressions easy"; diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 31088e26271..bdc32570dfa 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -1,29 +1,30 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }: buildGoModule rec { pname = "cosign"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "0g60qwdxk6pmkzj0zz9iyc8b0bzh751fj2yyz0vilkgcjq47xjk8"; + sha256 = "1h0lhbcrynaiwpgpkcn10yrn90j03g00w9hr2lvsj3cwmdbz0rcz"; }; buildInputs = - lib.optional stdenv.isLinux (lib.getDev pcsclite) - ++ lib.optionals stdenv.isDarwin [ PCSC ]; + lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) + ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ]; nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "0agmnl5d00hm854sj1iipng36pf7hcc26iwcmpcr1rsmc7v522z4"; + vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; subPackages = [ "cmd/cosign" ]; preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}") + buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"}) ''; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 5eda4e75f94..163728a37c6 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -1,8 +1,11 @@ -{ lib, fetchFromGitHub, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "darkoperator"; @@ -19,8 +22,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace dnsrecon.py \ - --replace "namelist.txt" "../share/namelist.txt" \ - --replace "0.9.0" "${version}" + --replace "namelist.txt" "../share/namelist.txt" ''; installPhase = '' @@ -37,8 +39,8 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "DNS Enumeration Script"; homepage = "https://github.com/darkoperator/dnsrecon"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; - maintainers = with maintainers; [ c0bw3b ]; + maintainers = with maintainers; [ c0bw3b fab ]; }; } diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 11ef4e1550d..ba4844d9ed1 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-09"; + version = "2021-07-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-FjiQ+L3eW+od41Vz00t/LhagS3SUT+PA5GvtZ6lhoFU="; + sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg="; }; installPhase = '' diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4a30b94f42e..8b90f7dd5f9 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.52" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 1d324982a47..53b1170b210 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: f376002331f03483d56ade1c19134dbf02ef2cff - ref: refs/tags/6.0.52 + revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2 + ref: refs/tags/6.0.53 specs: - metasploit-framework (6.0.52) + metasploit-framework (6.0.53) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -85,6 +85,7 @@ GIT thin tzinfo tzinfo-data + unix-crypt warden windows_error xdr @@ -126,13 +127,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.475.0) - aws-sdk-core (3.116.0) + aws-partitions (1.478.0) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.248.0) + aws-sdk-ec2 (1.249.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.56.0) @@ -173,7 +174,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.5.0) + faraday (1.5.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -188,7 +189,7 @@ GEM faraday-excon (1.1.0) faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faye-websocket (0.11.1) eventmachine (>= 0.12.0) @@ -312,7 +313,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.16) + rex-core (0.1.17) rex-encoder (0.1.5) metasm rex-arch @@ -331,7 +332,7 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.90) + rex-powershell (0.1.91) rex-random_identifier rex-text ruby-rc4 @@ -356,7 +357,7 @@ GEM rkelly-remix (0.0.7) ruby-macho (2.5.1) ruby-rc4 (0.1.5) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) ruby_smb (2.0.10) bindata openssl-ccm @@ -393,6 +394,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) + unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e2e1f6371f7..5217322fd6b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.52"; + version = "6.0.53"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-JN+ulGd47xZFSR7AdxfvviR5mwCHdfBmFkaAJPdaLJ8="; + sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 23eb207484a..ab8a1a21ca9 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x9d0awfm8s9y025iwn7d5an476f6xq9v99lnynj2vvj1kgya79s"; + sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167"; type = "gem"; }; - version = "1.475.0"; + version = "1.478.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vjr1lzddm1pcs5vkpxns1gmrv0l0wb53kcxhh1xdznb7hm8h5km"; + sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax"; type = "gem"; }; - version = "3.116.0"; + version = "3.117.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s0r1vk39sjxkc5km2ldvcm1l5ac2c4w5z9bvz18jgqis98j6zd5"; + sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf"; type = "gem"; }; - version = "1.248.0"; + version = "1.249.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; + sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; faraday-em_http = { groups = ["default"]; @@ -414,10 +414,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; faraday-patron = { groups = ["default"]; @@ -594,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f376002331f03483d56ade1c19134dbf02ef2cff"; - sha256 = "17rcbbvj90262rkg0xc702dpj95yxwbpgh0y952idvvqcyaaxpr4"; + rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2"; + sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.52"; + version = "6.0.53"; }; metasploit-model = { groups = ["default"]; @@ -1036,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w"; + sha256 = "0b0f9s18d2ax2k1xmwrvr97gxh8gfm79kfibv55fqmv846vgkkvk"; type = "gem"; }; - version = "0.1.16"; + version = "0.1.17"; }; rex-encoder = { groups = ["default"]; @@ -1106,10 +1106,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1"; + sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7"; type = "gem"; }; - version = "0.1.90"; + version = "0.1.91"; }; rex-random_identifier = { groups = ["default"]; @@ -1236,10 +1236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; ruby_smb = { groups = ["default"]; @@ -1421,6 +1421,16 @@ }; version = "0.0.7.7"; }; + unix-crypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq"; + type = "gem"; + }; + version = "1.3.0"; + }; warden = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index e4c6039c456..3f674bef7bc 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MrAJHYfTcziHTKJYRB6FW23XcHqdr9AGF+Cumw7hbcQ="; + sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; }; - vendorSha256 = "sha256-ZzpmHoMkrDAZcMXtD6smEaFEmT/EnRcKd7XYz/IK72Y="; + vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index a925d07cb7c..e542a2ae714 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pam, xmlsec }: let + # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = if stdenv.isDarwin then xmlsec else pam; @@ -16,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 567d3727a16..8ee2c9a4c4e 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, AppKit }: buildGoModule rec { pname = "saml2aws"; @@ -14,6 +14,8 @@ buildGoModule rec { runVend = true; vendorSha256 = "sha256-TieQVPSWtIteU0wTqX7si6GrPdYd4WD2eK4ZlLz0VJ8="; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + doCheck = false; subPackages = [ "." "cmd/saml2aws" ]; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 6cc5ddbfb4c..4abbbd2d1d1 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; + propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; meta = with lib; { homepage = "https://www.volatilityfoundation.org/"; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index a7ce0fb4b6e..d49c1e925dc 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.9.6"; + version = "1.10.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0anyxmqgn4kx102l3qjhh1f2b0cg7mnlapfhriyjw0zyy5gyqvng"; + sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv"; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 96857239bda..65e09d0aecf 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.2) + activesupport (6.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,10 +9,10 @@ GEM zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - cms_scanner (0.13.4) + cms_scanner (0.13.5) ethon (~> 0.14.0) get_process_mem (~> 0.2.5) - nokogiri (~> 1.11.0) + nokogiri (~> 1.11.4) opt_parse_validator (~> 1.9.4) public_suffix (~> 4.0.3) ruby-progressbar (>= 1.10, < 1.12) @@ -20,17 +20,17 @@ GEM typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) ethon (0.14.0) ffi (>= 1.15.0) - ffi (1.15.1) + ffi (1.15.3) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.8.10) concurrent-ruby (~> 1.0) mini_portile2 (2.5.3) minitest (5.14.4) - nokogiri (1.11.6) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) opt_parse_validator (1.9.4) @@ -46,8 +46,8 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) webrick (1.7.0) - wpscan (3.8.17) - cms_scanner (~> 0.13.3) + wpscan (3.8.18) + cms_scanner (~> 0.13.5) xmlrpc (0.3.2) webrick yajl-ruby (1.4.1) diff --git a/pkgs/tools/security/wpscan/default.nix b/pkgs/tools/security/wpscan/default.nix index e7a784c1a77..6a41611e67e 100644 --- a/pkgs/tools/security/wpscan/default.nix +++ b/pkgs/tools/security/wpscan/default.nix @@ -11,11 +11,13 @@ bundlerApp { --prefix PATH : ${lib.makeBinPath [ curl ]} ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Black box WordPress vulnerability scanner"; - homepage = "https://wpscan.org/"; - license = licenses.unfreeRedistributable; + homepage = "https://wpscan.org/"; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ nyanloutre manveru ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index c3d79ea77fb..80b5ec290c0 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -27,20 +27,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xzkbk6a93sdhshzlkx1dcpln3fcw2apccb7g6jha0g1im7yhgcj"; + sha256 = "15qh28drxkyv294l1qcpsghfa875p71q0vkmmv5l6fbmpapmllrk"; type = "gem"; }; - version = "0.13.4"; + version = "0.13.5"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; ethon = { dependencies = ["ffi"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.3"; }; get_process_mem = { dependencies = ["ffi"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4x366icbl9w13pk50vxx5kywlksvhxqxrpv8f5xpjxfl3jl64z"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.6"; + version = "1.11.7"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdn2v5cmxlzq9nkzh5lqnqr0mbiyn87g6bfc0074m19m38g19r9"; + sha256 = "01ig3fbxxm0gnvqkzmsc4zcipijprrw5xs84rnwp50w0crww842c"; type = "gem"; }; - version = "3.8.17"; + version = "3.8.18"; }; xmlrpc = { dependencies = ["webrick"]; diff --git a/pkgs/tools/security/wpscan/update.sh b/pkgs/tools/security/wpscan/update.sh new file mode 100755 index 00000000000..4e55a770fd4 --- /dev/null +++ b/pkgs/tools/security/wpscan/update.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash bundix bundler + +set -e + +cd "$(dirname "${BASH_SOURCE[0]}")" + +rm -f Gemfile.lock Gemfile.lock +bundler lock +BUNDLE_GEMFILE=Gemfile bundler lock --lockfile=Gemfile.lock +bundix --gemfile=Gemfile --lockfile=Gemfile.lock --gemset=gemset.nix diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index 305f5a4fe79..baccb14faf4 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yubikey-agent"; - version = "unstable-2021-02-18"; + version = "0.1.4"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; - rev = "8cadc13d107757f8084d9d2b93ea64ff0c1748e8"; - sha256 = "1lklgq9qkqil5s0g56wbhs0vpr9c1bd4ir7bkrjwqj75ygxim8ml"; + rev = "v${version}"; + sha256 = "1b4522s7xkh6q74m0lprbnzg2hspg1pr9rzn94qmd06sry82d3fd"; }; buildInputs = @@ -17,15 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper pkg-config ]; - # pull in go-piv/piv-go#75 - # once go-piv/piv-go#75 is merged and released, we should - # use the released version (and push upstream to do the same) - patches = [ ./use-piv-go-75.patch ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "1zx1w2is61471v4dlmr4wf714zqsc8sppik671p7s4fis5vccsca"; + vendorSha256 = "0cpj4nj2g0ick6p79h4pnjg7ybnyz9p26jivv0awi6bmn378nbxn"; doCheck = false; @@ -35,12 +31,7 @@ buildGoModule rec { # ensure the nixpkgs-provided one is available postInstall = lib.optionalString stdenv.isDarwin '' wrapProgram $out/bin/yubikey-agent --suffix PATH : $(dirname ${pinentry_mac}/${pinentry_mac.binaryPath}) - '' - # Note: in the next release, upstream provides - # contrib/systemd/user/yubikey-agent.service, which we should use - # instead - # See https://github.com/FiloSottile/yubikey-agent/pull/43 - + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" diff --git a/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch b/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch deleted file mode 100644 index 73967d817d9..00000000000 --- a/pkgs/tools/security/yubikey-agent/use-piv-go-75.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 547695fff9cbfc4037168cdeb07cfe16bd89b6db Mon Sep 17 00:00:00 2001 -From: Philip Potter <philip.g.potter@gmail.com> -Date: Sat, 25 Jul 2020 21:59:50 +0100 -Subject: [PATCH] Pull in piv-go#75 - ---- - go.mod | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/go.mod b/go.mod -index d4d13c8..f75be2d 100644 ---- a/go.mod -+++ b/go.mod -@@ -7,3 +7,5 @@ require ( - github.com/gopasspw/gopass v1.9.1 - golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 - ) -+ -+replace github.com/go-piv/piv-go => github.com/rawkode/piv-go v1.5.1-0.20200725154545-1c3200c75a28 --- -2.27.0 - diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 5a84cd6ee3f..547265196c6 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9o/njurf1AWt04A8u38FMFcteLZlRHDejbH9+ekDjKI="; + sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix new file mode 100644 index 00000000000..442f8d90419 --- /dev/null +++ b/pkgs/tools/system/jsvc/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, commonsDaemon, jdk, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "jsvc"; + version = "1.2.4"; + + src = fetchurl { + url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; + sha256 = "1nrr6ggy6h20r9zyv14vx6vc9p1w6l8fl9fn6i8dx2hrq6kk2bjw"; + }; + + buildInputs = [ commonsDaemon ]; + nativeBuildInputs = [ jdk makeWrapper ]; + + preConfigure = '' + cd ./src/native/unix/ + sh ./support/buildconf.sh + ''; + + preBuild = '' + export JAVA_HOME=${jre} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jsvc $out/bin/jsvc + chmod +x $out/bin/jsvc + wrapProgram $out/bin/jsvc --set JAVA_HOME "${jre}" + runHook postInstall + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-daemon"; + description = "JSVC is part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes."; + maintainers = with lib.maintainers; [ rsynnest ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/tools/text/choose/default.nix index 05b32512687..f5cded1beab 100644 --- a/pkgs/tools/text/choose/default.nix +++ b/pkgs/tools/text/choose/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "choose"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "theryangeary"; repo = pname; rev = "v${version}"; - sha256 = "0j3861pxqw0lnamb201c7h5w7npzyiwwb6c1xzxjv72m2ccvz76j"; + sha256 = "sha256-QX0tAo1cGPpRhggiAPxsVhKXg6TgaVl1lcp3na7jUNw="; }; - cargoSha256 = "1fdcz7vnmrw92y7bx49napi7j2jjc41liz5k63kbijfwqnaaiswy"; + cargoSha256 = "sha256-3pK7y/zC5iZkto5p5Xerlpu3yfN6sB2kjLF2fURlUj0="; meta = with lib; { description = "A human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/tools/text/gawk/gawk-with-extensions.nix b/pkgs/tools/text/gawk/gawk-with-extensions.nix index 751e5181bb5..1b82d798d33 100644 --- a/pkgs/tools/text/gawk/gawk-with-extensions.nix +++ b/pkgs/tools/text/gawk/gawk-with-extensions.nix @@ -1,7 +1,8 @@ { runCommand, gawk, extensions, makeWrapper }: runCommand "gawk-with-extensions" { - buildInputs = [ makeWrapper gawk ] ++ extensions; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gawk ] ++ extensions; } '' mkdir -p $out/bin for i in ${gawk}/bin/*; do diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 6caa3d34a0c..d4bb26a0a77 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "html-tidy"; - version = "5.7.28"; + version = "5.8.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "sha256-Tny53PtaQWAMAEjqw4tKnmGURfZhhwFQNCJr9jjWZQY="; + sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU="; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index e298a56c58c..beedabe34ae 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM="; + sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig="; + cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e45eda3326a..640bf49fc16 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.4"; + version = "0.8.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1rbsngfw36lyc8s6qxl8hgb1pzj0gdzlb7yqkfblb8fpgs2z0ggyhnfszrqfir8s569i7a9yk9bdx2ggwqhjj56hmi2i4inlnb3rmni"; + sha512 = "0gvrjxvizpxm5xvw8v2jygmx244wdl9n75qxz4chqbzkwshk4gwscz38p7sq9qlsbq8jmnv4l095a9dl9b836kym38hh1bvzmdiflar"; }; nativeBuildInputs = [ which ] diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md index 71c42917394..86e650afd46 100644 --- a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md +++ b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md @@ -35,13 +35,18 @@ See https://tug.org/texlive/acquire-mirror.html for instructions. ```bash -curl -L http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ - | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix +curl -L https://texlive.info/tlnet-archive/$YEAR/$MONTH/$DAY/tlnet/tlpkg/texlive.tlpdb.xz \ + | xzcat | sed -rn -f ./tl2nix.sed | uniq > ./pkgs.nix ``` -This will download a current snapshot of the CTAN package database `texlive.tlpdb.xz` +This will download the daily snapshot of the CTAN package database `texlive.tlpdb.xz` and regenerate all of the sha512 hashes for the current upstream distribution in `pkgs.nix`. +Use the url + +https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/$YEAR/tlnet-final/tlpkg/texlive.tlpdb.xz + +for the final TeX Live release. ### Build packages locally and generate fix hashes diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index f553908d9cc..1367d651a09 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -50,7 +50,8 @@ in (buildEnv { "/tex/generic/config" # make it a real directory for scheme-infraonly ]; - buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = pkgList.extraInputs; # This is set primarily to help find-tarballs.nix to do its job passthru.packages = pkgList.all; @@ -120,25 +121,49 @@ in (buildEnv { mkdir $out/share/texmf-local ) '' + - # now filter hyphenation patterns, in a hacky way ATM + # now filter hyphenation patterns and formats (let - pnames = uniqueStrings (map (p: p.pname) pkgList.splitBin.wrong); + hyphens = lib.filter (p: p.hasHyphens or false && p.tlType == "run") pkgList.splitBin.wrong; + hyphenPNames = uniqueStrings (map (p: p.pname) hyphens); + formats = lib.filter (p: p.hasFormats or false && p.tlType == "run") pkgList.splitBin.wrong; + formatPNames = uniqueStrings (map (p: p.pname) formats); + # sed expression that prints the lines in /start/,/end/ except for /end/ + section = start: end: "/${start}/,/${end}/{ /${start}/p; /${end}/!p; };\n"; script = writeText "hyphens.sed" ( + # document how the file was generated (for language.dat) + "1{ s/^(% Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" # pick up the header - "1,/^% from/p;" + + "2,/^% from/{ /^% from/!p; };\n" # pick up all sections matching packages that we combine - + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames + + lib.concatMapStrings (pname: section "^% from ${pname}:$" "^% from|^%%% No changes may be made beyond this point.$") hyphenPNames + # pick up the footer (for language.def) + + "/^%%% No changes may be made beyond this point.$/,$p;\n" + ); + scriptLua = + writeText "hyphens.lua.sed" ( + "1{ s/^(-- Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + + "2,/^-- END of language.us.lua/p;\n" + + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + + "$p;\n" + ); + fmtutilSed = + writeText "fmtutil.sed" ( + "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" + + "2,/^# from/{ /^# from/!p; };\n" + + lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames ); in '' ( cd ./share/texmf/tex/generic/config/ - for fname in language.dat language.def; do - [ -e $fname ] || continue; - cnfOrig="$(realpath ./$fname)" - rm ./$fname - cat "$cnfOrig" | sed -n -f '${script}' > ./$fname + for fname in language.{dat,def}; do + [[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname" done + [[ -e language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i language.dat.lua + ) + ( + cd ./share/texmf/web2c/ + [[ -e fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i fmtutil.cnf ) '') + @@ -200,7 +225,7 @@ in (buildEnv { perl `type -P mktexlsr.pl` ./share/texmf ${bin.texlinks} "$out/bin" && wrapBin - (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose + perl `type -P fmtutil.pl` --sys --all | grep '^fmtutil' # too verbose #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index c26b944522c..4497cdfbed2 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -109,8 +109,13 @@ let pkgs = # tarball of a collection/scheme itself only contains a tlobj file [( if (attrs.hasRunfiles or false) then mkPkgV "run" - # the fake derivations are used for filtering of hyphenation patterns - else { inherit pname version; tlType = "run"; } + # the fake derivations are used for filtering of hyphenation patterns and formats + else { + inherit pname version; + tlType = "run"; + hasFormats = attrs.hasFormats or false; + hasHyphens = attrs.hasHyphens or false; + } )] ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") @@ -165,7 +170,11 @@ let src = fetchurl { inherit urls sha512; }; inherit stripPrefix; # metadata for texlive.combine - passthru = { inherit pname tlType version; }; + passthru = { + inherit pname tlType version; + hasFormats = args.hasFormats or false; + hasHyphens = args.hasHyphens or false; + }; } // lib.optionalAttrs (fixedHash != null) { outputHash = fixedHash; outputHashAlgo = "sha1"; diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix index 6cdcde78cc5..a42b384803a 100644 --- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix +++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix @@ -584,6 +584,7 @@ tl: { # no indentation deps."lambda" = tl."lambda"; deps."latex" = tl."latex"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "7d9241eab3e1e34f8c1aef85c4f2278680cd147cc4f188194c8c27147df3b9bf2a3bee7c651227aac79996e0745124990950ddc010a4f6662fda4a2f72575211"; sha512.doc = "87de188abf9880f2e680d6582cfb20d8166eb0c3ed2d3a85971eeac6ba8abea2d7f46b8037c26b719c1289f778d4e94ae1813598e73f8f56f6224e3299852cf6"; }; @@ -862,6 +863,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "d52e4a817f839c95b7718c65b6cba571443f9f25533a9c7412a69b3f15c89e995494ed812ead2ddac9f0952e0e842216a7fd443ecf2360f50a36107241397c19"; sha512.doc = "ed91ca4af98a72f081aa021b598ed58888150a73346d5d8da9ef7171f7d757c6d690169e1eb4b3e409ed8b988b8ffff9475f35ca7a443074080c1c9568ebaa0d"; hasRunfiles = true; @@ -10423,6 +10425,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."stmaryrd" = tl."stmaryrd"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "61fcc778837ecff88bb0e80e39e2acb3ee64e2c26e4069f7634e5dc6c74dc93caab78e4b0088ed58f494d6dcd3a5084bc55cd471baaeb292dc208cf2a241bf69"; sha512.doc = "ee4458cd6d45a41652ae24b3b82bea5cfa2d8b9c14cf4ba1357f9f07d6572f8ba83e350b74659c471ebf5068f33f5c5762a11669ab2a4f5adb3db41f392956dd"; hasRunfiles = true; @@ -11077,6 +11080,7 @@ tl: { # no indentation deps."latex-fonts" = tl."latex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "dd6b98eb22786f39c830a4c012396507dca694d727f1a7eb147a1c8c2d4442d8120e016de4c08c038239dfac866f828bc7686d8fd124d1af63edd0994db80f9f"; sha512.doc = "8ec3527c25c07641788b809cca4f4cc8bb034f63f1100b74270041b503dbc8926a410429a370692502596bd6ffec69a970a19b1c32178e4722f81acdbf0ea934"; sha512.source = "0563f453bf7e34b4948a29d832207f8148082c5186a6915a6bdc1c41d0c08399505491ccdea0b45e8bf326a8e8459d37eeaca546143d9f622ce4dacba11cac7f"; @@ -11094,6 +11098,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "27fc3fbb1aa29693fcd1d39abf92e3248fa769b8c4e0171948c2a7957e52dad2e08759050321401f7cb900285de62246bc0013d22141281111a82681c11802e4"; hasRunfiles = true; version = "Mar._2021"; @@ -12018,6 +12023,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "ed2a3c4d91ecc125ecc2179594e66b5bbe66bb806c1b232ae1b71fdd0d29152a2d28e3dc6dbb2e1724650b8b8cb67e8c8bdf5b7506357207ba61c636768fb8c5"; sha512.doc = "e40955db986b94bb9bbbbf9daaf6a12d2898ae736741fb0a5626755b55908b056a2b4dbc1d87e9681201d7e45c99297393d6e1d2de17d135d8d74c732106897a"; hasRunfiles = true; @@ -13809,6 +13815,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "a5b93a081e9b2201a65bf7e7fb01381480f5c1f31aafaa78c5785981d895a384f1f8db1d474db845c06cd0850cf70ec4bec0e3935b67fe506b8b07512ee97479"; sha512.doc = "44d804287cdd427043f766ea9f5f352d93d65f941b3e18727dfc9276fc381f51fccb3a025707f24dca5efd59cccd1a340e5de0d452d928ec0296b4faa46abf67"; sha512.source = "8edb47575e32de1d7947bc2b7e1e354eeafe287cce6b4c7bafa1266d9d7c1bd4c8df363ecb4c17da9eb35cfc1e3393e2297ae6d90f9f4aa8147b4467e2ae1c89"; @@ -18001,6 +18008,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "0f969847994b3b377c752c23f802e8c51b4076efc2d43ad2560a72b83cea3bf0a64d7df18a59afe4289a4547a9f23cf81b0c365a499be85a2467579941fa9700"; hasRunfiles = true; }; @@ -18009,6 +18017,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3f91560ecf78c5540fd4f5d9890f6aa7a57bcd3a41095985785505b82e40793b91a5da3a01bdc021b11c32db3dd7030a104686b34b496c9094acfb85509cd007"; hasRunfiles = true; }; @@ -18017,6 +18026,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "85012062097dd4b624cb39c68b293169a25ab3c9cd15b4474c3a3ffbe4b8ab13d6856c6c70a580da45a2d210952df2d9760682da3917cfd24d17772dc2ccce7f"; }; "hyphen-armenian" = { @@ -18024,6 +18034,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "59538414bf5a4701199100fbd9d5247999a36bc28c7c6ef2a28deb9024e01605d48839f00f345c848365853ac3a9f1aab7402f44860532d7a5c099d2f27ee189"; sha512.source = "d25e6347545e00a809db1dc8e48ef3fe67678b9ec93a1f3619d2a5a3d786d6e411c2e9f905120e3c5d01d9489c0a83035ce8025836249c88ee768bf07b8e2ca7"; hasRunfiles = true; @@ -18039,6 +18050,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b90680dc5692824d60ca603e8bdd2fcade7cc772c8c0f9538d579704fb16165db2baf0c466ccaff46d92491b4a678fa86a127c0d106dbef6d640dfd2f887663d"; sha512.source = "75a20da77fa056c719ecc1f014bb09c67f62f1c4a3abe04b7cadf45c7a4e06e4492cb0d34a8025f19f3ee5e3330e488212885095335d4a7e97baa5b106576223"; hasRunfiles = true; @@ -18048,6 +18060,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "19b9bd10d2357d0cb6ecc9ddb5e46b65b3c0eec1b2917a78311f255c1609bbb86595ce617d331271a72de934ae4001597f4a04d61b3810e34f3b197b21cab193"; hasRunfiles = true; }; @@ -18056,6 +18069,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9763e6ece053594b01cd9255a8a3551eb6b86ab082f6f9283664e256c55d43b9513b624774a650d83215d656334751f569496030187c1c78e2fe80f2d10f2f1f"; hasRunfiles = true; }; @@ -18064,6 +18078,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "37189e09ee902f2c5145f30180b51211091b07d7d04125c98f1b7c424ad27f6899424b78cd17c559509076eeeb957b4f268fb4130807e7fafb461174fed8200b"; hasRunfiles = true; }; @@ -18072,6 +18087,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a78b70095fcfe297e2d85a49108affd5d48451ff4740461eed46d395410a665011614c9a89dff37e9477ee3803de6ebaa68595ac39222f2968a4124355ea7fa7"; hasRunfiles = true; }; @@ -18080,6 +18096,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "c44b3f5fec7b44958336dcfb1a43c5b71fd1715262278863f5fcd74d7ec0cc6f1d572b741256d791e6979f15e4b0fcda8058725e27f17e1deb6e5df5fdb007ab"; hasRunfiles = true; }; @@ -18088,6 +18105,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "fe36adfe900e23f2b0c3e9c3a3d96b608c49bf597222537d355d6a68e2f87f587db78a1921ab1c9a80ea175529e353524c35e99b83ef7f5515ab7c0aacd2f680"; hasRunfiles = true; }; @@ -18096,6 +18114,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8355d0aa95bb2e72bfc45015f9ae9f6a138f94441387a4daadfec5be4060878f6e69d05eab15432d99c256c1a3f68c122d5c915164fe343459d658a4543ddf42"; hasRunfiles = true; }; @@ -18104,6 +18123,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "f5c8b08c2db716dfa6d36fcf337b4e18372978d04e28ff2c8ed0a0b3866f4bb3efb7b498fedbfde5052fc504b8677ae553c2dce73701e219632d8c5460d7e826"; hasRunfiles = true; }; @@ -18112,6 +18132,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "954543a3fb81ff00d9c58315ba59d7a5e3430217dda6c1453bcb7ffb0516025dea4b877eb9d66c9f80ccc69d3d4895bdc6ae1b611d8394435fa647b8b806559d"; hasRunfiles = true; }; @@ -18120,6 +18141,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "111371e47ca29069a5a9144d694858dd899b19e2b38d0c793b1e4884c69ae2d62398aacb4cd89e23246fc025e42872875bc808c1f327ac1502fac88c962e6c14"; hasRunfiles = true; version = "1.1"; @@ -18129,6 +18151,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a305cf89138e4327844d43a7e21773e31ac97a4655e4d58ae9a46dc0df565e432330debf704c37b4ad552561357521eba0b676755544ceb9c4f21ace09d6dd2c"; hasRunfiles = true; }; @@ -18137,6 +18160,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "ed2976e9fb3eec5d2f0759348b284129e43bf161db571dd21270335388b8aec57e1b8393bc9b246f8a6e9cde22f93a4cb3c1a03dcadd64fdda3d70b576789050"; hasRunfiles = true; }; @@ -18145,6 +18169,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "0eb91153214aaca8c3b5816f5315f9afdeb7c19521c87c79ea2b35e82217bfb23c8bb774baf810206f4413fc663e441ebe6b4962880ca0dbcda9209d2acce3b8"; hasRunfiles = true; }; @@ -18153,6 +18178,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a1532603758e7f774acba7c13ee74f0046ff187598ca86b2e93b91da31317f03fdbab5d4d7c0814978fb2ac159bd6e5a48e6e734c19758da21ad0a031844f52b"; sha512.source = "9d6c8c1b0ce5c40d388937328461336a97fcf1fe780fa6198e029f12ef118d9d98f6eec03ea217743851f0217217d6548298df9336fcf33e6c4c196bbdb9eef0"; hasRunfiles = true; @@ -18162,6 +18188,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5b02582769a55bb07d81e748e83170c16aca1c33b0a240cf547fa9c2212f2be52223e258229c760ddc5dd730419bd9e761614cc4fb3b3ba8102841bb779af511"; }; "hyphen-finnish" = { @@ -18169,6 +18196,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "6aa171d77952165cdcb1b667885f16dd382124ed70ed1db80a9a89553d972720d8ff5f0da1b36669e02c3030d9ff362ab77ba1fa2ba45cddfb460018f0c0191d"; hasRunfiles = true; }; @@ -18177,6 +18205,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b9d2d05311a90f4caa6c4e8aa8a2e80e9c15fc3552f03f0ac6ec70d386610612715deb6e778247248355a3a209fb2413d6d2aee12f18bc35d5a334870b612507"; hasRunfiles = true; }; @@ -18185,6 +18214,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "d1775a9b6e6b7fa155e44c93271e2ccb41bd1ec143ea0cf624841ad48a123db924dd134e6e60b862a808ad2058ed5b86cb34d98e5728b9dccd3997ba2f06932e"; hasRunfiles = true; }; @@ -18193,6 +18223,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "2d707542f80dc94ad20c0daa776df23b773a5e6ccb261e11db675e1e89f5f303a4f5cd50d97f491cc7ea8b0f3c0d3f6391707812a95d4e72cca3afa7815e566f"; sha512.source = "b9925168b1f9ae5139ffc3bd34810cc05a27475cfae31e98fd0d7618575fc994ca95d7479506024abec2c33bb20121811244d69c490df18a29d6c93fe02174c6"; hasRunfiles = true; @@ -18202,6 +18233,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "edaf041a2f92b0f7dbf28042c81838e8fd781cf9c3ad529c314227c94917ce4e8728ca676f8bd42e2a81bae76b11aabc1e22896e3ef9cd38ca4b718bc58fa0cb"; hasRunfiles = true; }; @@ -18211,6 +18243,7 @@ tl: { # no indentation deps."dehyph" = tl."dehyph"; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "bea7d4605b1a18d3e7845ccaa06951b62178b3abbdc13dc59d3cbece3fa95fc4fba7e4d60dd253cd9fc022f804975cae5c4996fb99d3037c29971ade9984abce"; hasRunfiles = true; }; @@ -18219,6 +18252,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3da84f41aaf7e5d4be0ce609e4d119e65c9189ff6662051cb7e879e9e373d990ef1c59ac7cfead1bdbc6e55b52d4b3ed28d157b22dbec43e5226f16872d5a7de"; sha512.doc = "865aaf1f9f0fbe130f9006e41ef677713667832745fc24c28cffe805a540a19f7104a3f0fef3258ba0e16c1c456959904887899a4c584338c58de7fcc80c5419"; hasRunfiles = true; @@ -18229,6 +18263,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "868a4c3f4d0eda078054026bd1ec35e05c2f4013e093bf58147bfa2d861814242b55a900ce60384767558c9552ff9d41cf447e2a157bae83bd2877251012d96b"; sha512.doc = "164180f0485e16a49ba83dcb4721902e8a29f399032d4f5a59d55e424b8178a25dedd9fb99919d9d772142342fb78fe0dbf7a5303382a0b7feae4a381b76f8bb"; hasRunfiles = true; @@ -18238,6 +18273,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "69add7ccde189e86810e2a82692a260de9a9fcc0ba011352881d202d4f4c94c4dbd84fe36dff40ef9b9ad3e8e990947cc61022307790f13cad56744f3ef5e41f"; hasRunfiles = true; }; @@ -18246,6 +18282,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "765be1c13ef3445b056b61c24460cc2f18bad038c04541bf4773c7f61c6d26be25d3079b260a1b9623e2f01155ec52eb5bc87b0ea9234e50a5ca24dd8a7a5937"; hasRunfiles = true; }; @@ -18254,6 +18291,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "3f04a63010c02d77cb229c90aec9f1079557493958573be9ce992ac5ae3c229f01f9abc0cac785d9340ff48aa169a01f8b327ecb2e255bef57f1fe85d04d1d2a"; hasRunfiles = true; }; @@ -18262,6 +18300,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "dfed82ea70f25d452726b5cd03d8e060bddc23cbbc5deebab2ddad93ce6744c38d357327fbe570bf7a1444f62cee0cc422a6c7d066d6693a238d851b4fe46e32"; hasRunfiles = true; }; @@ -18270,6 +18309,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "478a77c4ab8231a3041c3427075f16c072f58a394eced8ff0cd5da6544f3f2fd65722f33fd8344e18060c96f09bd18b90af71f8508639fc9c59d29d704d9e348"; hasRunfiles = true; }; @@ -18278,6 +18318,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "4e79ee31893d6c948a3aac8588d4beb75d89f89df973b1e39cd63894e008af55f8dca774194d7eb105fb0aef692b17bb645d5bd85cca7debafd74aabf241bc30"; hasRunfiles = true; version = "4.8g"; @@ -18287,6 +18328,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "e5114da178fc841b1079130c01f8729ac94f0e3592dbd479f44a978ea009fd75b410d6130d9badd6227d115d8f6dad3ed4b553dbfbf4f80be5d1c2adf108e2fa"; hasRunfiles = true; }; @@ -18295,6 +18337,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9d0db7fcad4ca764379957fa22f9daede79898bcacfbdb62abe54318a52dd82a66f8e39542c18008e3f6b6d0db284b1e9b891531d3c8f3c9cf22c764e83d57b3"; hasRunfiles = true; version = "3.1"; @@ -18304,6 +18347,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "85aeadb0cb3c5de9ef48057132ccd958d17f014b07b56b9ebe2186a709c4e7646fad260e156718e43ec3eac88681654f88c9b53a6d71fb3eaee934dcb4439ed9"; hasRunfiles = true; }; @@ -18312,6 +18356,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "7a691e3c55c768b9ea5ef13552dc42025ab613df0a0d5c0d54aad58b63da11a93e59bc53e6a8211d5e054cbea8500846da01e9619bbee723d648e2d369a49d55"; hasRunfiles = true; }; @@ -18320,6 +18365,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "f88208291212874df493151581205d1b270b2d4278176c42e11edac9b344b73c2ee859f93b6947e4a6003a00abc4d3753024add9caf84f114c8a0cec72aa8c8d"; hasRunfiles = true; }; @@ -18328,6 +18374,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "159562a8feb25918bc422e7dc78a46423c7fff2f3c61016a0162761411999a5555be3c6e36cf967d5034f65c12f4b0834ae0c0423c2f3ab17a65034b1803dc72"; hasRunfiles = true; }; @@ -18336,6 +18383,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8b02e90bfcdf3c6d4bd1966b21e0512069f1749c638d537e9553f68e61e0bc325db8d3b462f45650db4376c7a769c2cde3e0c0601d7de272898a23cd2251c064"; hasRunfiles = true; }; @@ -18344,6 +18392,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b0743d1f6083dac7a347e22aed19d0c5d76119582e4862557a55b817b17dddaa69a2150f14daf6b08689278dd61b27c1b6ed45df5601dd6327bf185a7a46a5c6"; hasRunfiles = true; }; @@ -18352,6 +18401,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "fa7fc73edd582ba20b8236507385f0a30f477bb9c79e35fea56aa4020be966b9c4a16a327848dd051fa4cf6e6117ef8a51eb92ed6cb72f6993cb290fa5cd5ca3"; hasRunfiles = true; }; @@ -18360,6 +18410,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5580b3865ff8d20d475cb962b0257b909ff0e410b6776cb8153145fb0ee42b2f777069413bc6b3622c8c52318aba1ba836210e8972c5b6a47ef978c24fc8848a"; hasRunfiles = true; version = "3.0b"; @@ -18369,6 +18420,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "9d9ab3e616522ab9837bb7c7509127f998c442e96f96ee6b6fc0fdc9ac53fd03319d0c0ce28e23a35f1ae0ebb840cdeb19e8ab6444549c33059b28e7b307486e"; hasRunfiles = true; }; @@ -18377,6 +18429,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "124a93a633731dc1b3d6cbf2fc9b8489bf0737911a0c25ea44dbdfffa07c165ba5804dfd7e9cbe0be3b6eceb9fd6e95daefcae2356ee140f644416bbe1b13507"; hasRunfiles = true; }; @@ -18385,6 +18438,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a69d3881493c70cfd58e3d79ed76ce6f18bbcb43e1683f31270eafeb743b366a3c52c9945ff94db333e88ca18145263ba74002f5e78bb42d7aefa48c66af7955"; hasRunfiles = true; }; @@ -18394,6 +18448,7 @@ tl: { # no indentation deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."ruhyphen" = tl."ruhyphen"; + hasHyphens = true; sha512.run = "f17852dffbb8f5c337b8316b92c2b0a60a318df491231047d9c0930d55d8b2be3274ec94d0d87085d53e06e89c585d47250f046300bf3890ce751f6f2052d348"; hasRunfiles = true; }; @@ -18402,6 +18457,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "e84b6ca93e922c9c6edf03f4dbec1fae9eef2462379ef2fd0f3508a5048b54819c5ba12e0d76bafe1336666ca74ba95e27f63224fa048068bc515f3bc41f6eba"; sha512.doc = "95c6ae15687118ffc9019c8634347a602e6590b4a1d18bc060e57fe548a81f097070322975be1f62fa2685c5affff7f31b4854b0ec941bbcb9377ecf16986cea"; hasRunfiles = true; @@ -18411,6 +18467,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "390aa9c116b6db7b362fc57aa0758a4c489c5fe33c718fb37675b17a9772a463ce532a2ace3e1ef90275b4afef5ea8d6cff71a7abe625d84e3f461c115306452"; hasRunfiles = true; version = "1.0a"; @@ -18420,6 +18477,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a0786980e0cda7029a72075023520acdc998b83226e85deb0b8186ee4293560321517d507f74fbe68f1d68a16cd8af67aae68baead9176f9cc687bcc7d0a72e1"; hasRunfiles = true; }; @@ -18428,6 +18486,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "a605c9149ae452df8b2c25aa0f6bcdde53150e4485147a065f1f56c9740c3544c5c7f9c6049aea913916a62aabaf40777cf6f0f76a858e485c0bd09826a6ef5b"; hasRunfiles = true; }; @@ -18436,6 +18495,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "d6783537ff44a326b83c2004afd63f5bdbd162fa4865138c2e6d34c9e6a103ac41dd7b382454646b09c74970f8e0d5827a5f4af617936f74fd300b2054a096d4"; sha512.doc = "263fd9480c5f225c7e36169b86e846baa64745b83c1072c9602e873f2e7cf8e63b07ab85b29e9d4263656faff58a39fe83e1eba34517b8ba34720f189c8e7f43"; sha512.source = "b1ceb7602a46ecab68fb767ffb154f0dea9626d81bf6c46dd43be328204f72141842c81efda9d7d51997ed25356746e345f7cd9f9ed88ac2f99746794becb75d"; @@ -18447,6 +18507,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5f993ae6b22eadb87b6a1839bfa7d78a0dccc1107c5afbec8c248ed001018da38bb179e29f2430cffa90283221b20c5475346a8d5566edf16152266257f2a37d"; hasRunfiles = true; }; @@ -18455,6 +18516,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "8336eee03250859ab4328ad3c1fe437d2af688ef56b43be49c45838965ffe033befa84cdf600e9f48cdf60cbbfbff44450c830bd4c34556f680c5096ed3aecc4"; hasRunfiles = true; }; @@ -18463,6 +18525,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "5c7023e01bf59af4d36bd451f51ae00c445711c7ecf109c9d835f1d689446d7b0b1b2627b7f9e84e4f4a8ceff52227ff280ac64481e1d29d538a30e093dace85"; sha512.source = "2aa80889b9657b03b6beb6510b6790fba13811b97abbac186eaf4d3f40212b41db0dd2d21583429820faad558b0415a09aa8254d2edd96812cf6396fb18ccf5c"; hasRunfiles = true; @@ -18472,6 +18535,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "c984bb7f09c5816c36a7a790f16df1750ee90f36e2130994ecd1db63f26afb650245985699a80da9b4d7004ad67106771d8c7b79262438369aee3f52fd8374cf"; sha512.source = "a496f681db0b4b85d82ec1dd60c057f63b6d1c1b52d391e7bee98d3d6e1fb596701c91f2ca400d0df13b96ec7a43d275646b7d2874fe1e4efc9d9b2b47f6cc5d"; hasRunfiles = true; @@ -18482,6 +18546,7 @@ tl: { # no indentation deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; deps."ukrhyph" = tl."ukrhyph"; + hasHyphens = true; sha512.run = "05a9111b358c659159c6edfd38b9ce3d78febd794cc82968dc3e2acdc3612786304721fbd07f00f0a8278f4c2e46a1bfad821b5da45e60546d6acb5bf9068d08"; hasRunfiles = true; }; @@ -18490,6 +18555,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "b2cb1bcd953ffabbd3f5acd8c72e9c60415fd300004de56ee446fc77d381aac1db65d613a2f591d3d0e45f2a12ff5340457ae3061b4c77de502923932383bdcb"; hasRunfiles = true; }; @@ -18498,6 +18564,7 @@ tl: { # no indentation stripPrefix = 0; deps."hyph-utf8" = tl."hyph-utf8"; deps."hyphen-base" = tl."hyphen-base"; + hasHyphens = true; sha512.run = "12a23e0b9d00eb4381e3c97ecbb449faf5a73b755a17fc0301f1cbad5d0babb370aeec16dcdd316cefb56e142873abaa685288b1a1d3c7dcb76a07a9ef127ac6"; hasRunfiles = true; }; @@ -19318,6 +19385,7 @@ tl: { # no indentation deps."url" = tl."url"; deps."wasysym" = tl."wasysym"; deps."zapfding" = tl."zapfding"; + hasFormats = true; sha512.run = "985e1ed14e5db0a23e9be510e5a52456fdf07ff8c8746add0d1123fa8b8684b3a0c5d9e99e06aa193c667ffa2dd648419d4359a75685d6514e81b9ef0d92ff22"; sha512.doc = "bf83fb4dc700f10050d34905197a630f8de75a6a27146188efc254b831ad0d68cc873b610f7457a3dc1140a10793aa05c567749efc38225089014df99fc2c895"; sha512.source = "63bf7f94983a971833e1e1b7d33afdf684d83117e4ce846334952176641b45acfe0c18b2fe983c2f24d98e68e91469560c2c10582d53015d069802a38066280f"; @@ -20245,6 +20313,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "b349e8fad2765c4a87b471532dcfafedc0a9711237c6e967011727da7bad3a5ed27a89eca81af324aa84958872d0b78c68e6d9490fced44eb7636b2fbf36611f"; sha512.doc = "7cfb465f4db5089e7fa41762a0437f5f51445efdb9aba5d676dc5933e0fbcfbe0fda31baf83e20f2d16e6a7a0019c71752af8744d02ad12636adb9afb8cb3041"; }; @@ -20275,6 +20344,7 @@ tl: { # no indentation deps."pdftex" = tl."pdftex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "31c364be709db593c1a1d4e5250a7d8899fe0f5eb534c61c5f67d1a032b4afca9a91c5d2d1a541e96045d294c87d7ca1758a6a59bce8a3e94bf5511e20cf8854"; sha512.doc = "94474a52fb6a2bb801405c83562d6dd69038cca8d73705f382c2acc6c63d57e057a6b6c1b93556e41f5d0d9f9adfa269f0857c35e6523108eb230985752c3261"; }; @@ -21366,6 +21436,7 @@ tl: { # no indentation revision = 45678; deps."cm" = tl."cm"; deps."hyphen-base" = tl."hyphen-base"; + hasFormats = true; sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78"; sha512.doc = "206dee2be733e3ac04b5b259862b60fb3641fc44ea182da601ca54a010ff8e42f254dd01c03be7bcdd2a6258110c567a596ee82b4eb74d04ca8ed70e50cd6a86"; hasRunfiles = true; @@ -21863,6 +21934,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "bb198606ca33912f75327b0799061a81aeb9e2315182001710929d5a7c786fc11b58a5eadcc186f2db21df01777904ada31058c0a03376c04020b213d9f7c519"; sha512.doc = "9b7c72ad24d459b345552ee8ae05c047c61cf3e0b6eabb927e2a02bf62558f143e937463574bdb0cc60a0a4c8b2da3f86b1d9361275142519044051039275f1c"; }; @@ -21918,6 +21990,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "01777af9a468b6216417c5158034c3dea3cfb1c3ca7d28f1c4ca2b239fe569fbde410d17662bf9a10f5fddfd1bb6541c505d772e705832b52a1c2d6225d0fc6f"; sha512.doc = "a6a17f70a44655e1aba11ac1353cc13b36bee762083be76a31c04d90ae73d021659219a3a741b70f0b43888d6b6a6ab356f378fa5850a23ce7423b28a721e924"; }; @@ -22043,6 +22116,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "c16a8cfa5ce0991d4b667471dd32f692c4e340d1856a36fd684811d40322f912b94125ae101ba095ca6c54b2afa3a37f1ab9af83e4a10328f8c1a1906a02a44b"; sha512.doc = "0d2492075eb2bb6b9cc8a67b0ed53cf5a8c4c700797d8bce8061a4cf938db5cf19fa4ed6f7adb59b1da0701ff365504e813289dea3c245ad717c82bc58df9128"; hasRunfiles = true; @@ -22935,6 +23009,7 @@ tl: { # no indentation revision = 57972; deps."kpathsea" = tl."kpathsea"; deps."modes" = tl."modes"; + hasFormats = true; sha512.run = "7ea3271c2a9682ae5ee29a05a95e794f4a6dc5a6244a6c243e856aaa857310127d5593b0643d4ca53eae7feb9c205574f5ea216b7c3c0b731e7f98be99bf1588"; sha512.doc = "95e7221ac9e3438d4cae336296e7db855df9a7e49ebaaec5dfea294565824938f3d6544459cee9ecbf17312daad4e44c92a7a9a65269feebd2b819f226f305bc"; hasRunfiles = true; @@ -23088,6 +23163,7 @@ tl: { # no indentation deps."tex" = tl."tex"; deps."tex-ini-files" = tl."tex-ini-files"; deps."utf8mex" = tl."utf8mex"; + hasFormats = true; sha512.run = "a79d6a1ecb15f7962826773d7eab4b1ffd86a5c15f8076f096fecf63df1bd661449eb7d14251a57a1eb2bede030ddf93aac170fc3c59ae0a124da6cef69e55be"; sha512.doc = "091f2825376718d8c2190555af7ef54d0ae5202425d57b986fba861df2f8604301df5a121ccfcfcdc91032d07dcda8289fb8de5d81c487b93b0e202a2a5a658e"; sha512.source = "6f20a7e4f80670f7dfe5b2cfe3357a5d16b0f627b5e9e95c2d7d46598e00b989d5ae8c797589c56c594b7d3610f5f79cad42f3bb64a628be968e4e9e5d541e98"; @@ -23131,6 +23207,7 @@ tl: { # no indentation revision = 54074; deps."luatex" = tl."luatex"; deps."metafont" = tl."metafont"; + hasFormats = true; sha512.run = "ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6"; hasRunfiles = true; }; @@ -23488,6 +23565,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "0b3fe440055cc4c943fe8cdee93997718a3625782c5b2962cb514011f2038ad14518f7cffc55dee41f0a57f7401b8f2f493631a2b9cbeb806ae75ae80269f3b5"; sha512.doc = "a3b962871878f3f34c2d419fa9ae1c27518f3901212796d32649b5524f49fa103a71f46403726b9568ac358ab98afe7b23356a0f2d2d8592c0b84cfc186d5f53"; hasRunfiles = true; @@ -23816,6 +23894,7 @@ tl: { # no indentation "mptopdf" = { revision = 57347; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "69181f1facef413b4e2317180f8dba551fe40bb06e6af8d9378319d8cd3fdec985241e632f19888f32b70f16a40d11c66581f7e3c409bc38b7cfad3733cba2fd"; sha512.doc = "f0cbd95500324a6b5ca835d62065c83028241e0ce5fa35a313458dc30e6726a21a6d1c267669627061d23f2dd7d7397f471581021e03c817c281cb6efa1d2769"; hasRunfiles = true; @@ -25260,6 +25339,7 @@ tl: { # no indentation deps."lm" = tl."lm"; deps."luatex" = tl."luatex"; deps."rsfs" = tl."rsfs"; + hasFormats = true; sha512.run = "d734139205c47599f3490dfbf13e6f71532ed7c311c3c76b6e444e539f1be6dd1bfffc612f8d019c38923d46ea7c98be72b28cf83c2b00885d787f6f526b0f0a"; sha512.doc = "285d74614c05d3776a41269da1156930024359eef282b3d5479a5397bdb928357ff3020d3fcf47bc92d8ce4ae37a9c4fd68c9e601d7083911145a2bed2bad4f9"; hasRunfiles = true; @@ -26007,6 +26087,7 @@ tl: { # no indentation deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; deps."tex-ini-files" = tl."tex-ini-files"; + hasFormats = true; sha512.run = "17c2b07af5e14f9f581d1094f4a3657ec1fe2b19fa96d952d1e4859265dc26e42743dc1fd7e8d6a7de56867be1b50a7071524d0580a8a680c605146893e7ff1b"; sha512.doc = "8422210dceae381676a4c03784ab2c9b0e9233913eca6d25a9a7d5c5675f9ecb32f0a93dd624dbcc715f20d7e386a7844ea00e6e85473c1af14f8e384cd3f61e"; hasRunfiles = true; @@ -26720,6 +26801,7 @@ tl: { # no indentation deps."ptex-fonts" = tl."ptex-fonts"; deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; + hasFormats = true; sha512.run = "787554d26ec4acb3811efbe96349a51b517e5b3b4677754d94dfe1d0ce61088d016f21995e5e9f49e1ace76a1e1f2c057c126981a9e340a9e047597f637aae3e"; sha512.doc = "f0085548bc20f0389d475a9abf294a8713d36184aef1c65e12d5a7621a4f60e26cf8b63f6a1d558afe964f633455fffd9f492e749938c290b91c10e02c6cb4d7"; sha512.source = "50afb0b5a1b766f89d7f3dda64b74f080a06d25d66618a4466018209fe4e3245f8deb274b22e30b45fac0a8a9f903ae70ec0301bfb72a394ebc3759e065205fd"; @@ -28253,6 +28335,7 @@ tl: { # no indentation deps."plain" = tl."plain"; deps."ptex-base" = tl."ptex-base"; deps."ptex-fonts" = tl."ptex-fonts"; + hasFormats = true; sha512.run = "d59108f06a06b7ac46195ef05c0ba6fb4873a88d327839a6143e94392faf3df73ae7b128548ae1ab69915f9883bad554f0e2dbd8d36b8f8c959897210895fba0"; sha512.doc = "4f863d89fca4c137a84fe75365f600da96f3901d29dd98e9d5733523648b746861a22284707c6e9df90a9939c83adc7bcdf21b310785b8d403459d65294d1133"; }; @@ -32394,6 +32477,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."kpathsea" = tl."kpathsea"; deps."plain" = tl."plain"; + hasFormats = true; sha512.run = "e38f62fcc5ccee22a909eae5ea196e055eae59eedc652ce9788a3b4520995e97f64c683f1ba940853a06030a7ea6f1d749ed4dda1cb30433f87f5f9cdce5a9a7"; sha512.doc = "3056263569276ca7a62ccb03542eac99b648d36c398ded17204a2624f06920c506985aedd1a639a48bc60af6394d091cdfd9ec44000730bd8e8c83c2234bb569"; version = "3.141592653"; @@ -32801,6 +32885,7 @@ tl: { # no indentation deps."knuth-lib" = tl."knuth-lib"; deps."plain" = tl."plain"; deps."tex" = tl."tex"; + hasFormats = true; sha512.run = "7309726b33eadf8290e596aab50bb1af95600a067338b352c1ac092643a8c6d4142180d0146abbbb828a38fb08fdd9ae03da6572e6c221afcd151a51430a423e"; sha512.doc = "2a4979a10514ccd589b331ff34a677a4e22adbeea73d6112c9a14392b3ee75a8cdb292b008b160792b3d00b812834afa7e0211db860c41f1beb69bbc900fdb90"; hasRunfiles = true; @@ -34920,6 +35005,7 @@ tl: { # no indentation deps."unicode-data" = tl."unicode-data"; deps."uptex" = tl."uptex"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "8acef423a0359136795301e1deaba156c702ee360f309d1884a90b3ed89842389bcc015e70c1461611ebb4a21fb9d5853db5ef40226ce0f61eb11f2a424a70f4"; sha512.doc = "7cbc40c770c1e04114add004fc4920e3c7dea62f959d06fcbfe54b9fdc45893214ef3e960ac685cce258b07fab424aa7a242da368aa1ee0015ddf8579d582820"; sha512.source = "9c1c1d0fec518410938e6642123f64242a6ff0bbb6425945897c10754e436fbd82d6739d31717152d183da385800a569d9209f37dd38c8eb77767842e0822a67"; @@ -34960,6 +35046,7 @@ tl: { # no indentation deps."ptex-base" = tl."ptex-base"; deps."uptex-base" = tl."uptex-base"; deps."uptex-fonts" = tl."uptex-fonts"; + hasFormats = true; sha512.run = "1ee2679e7531fe4406fea72f7efc482f7900da50cb74045a62c0b5e5596862011509c3d966a795bc13538170afd7db26e8cf4f406391a746e45804414f26cff0"; sha512.doc = "06a3459702bc9838f2246aad7af99c427413a43356d88165e68a132bf8b926d9ab668e6dc10127c27eaac6526085c3fa069bb9709833cef241c94d0f4fb3e02a"; }; @@ -35893,6 +35980,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetex" = tl."xetex"; + hasFormats = true; sha512.run = "93df696d59d088bf5808b5dfe0ad6a834b65252dfe1f06cdc0d2f446a57b97751c08464e58be40ac042cc508d5f846696561d6524bbb84234af11fd3b7c61d00"; }; "xellipsis" = { @@ -35960,6 +36048,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xetexconfig" = tl."xetexconfig"; + hasFormats = true; sha512.run = "dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6"; sha512.doc = "544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa"; hasRunfiles = true; @@ -36186,6 +36275,7 @@ tl: { # no indentation deps."tex-ini-files" = tl."tex-ini-files"; deps."unicode-data" = tl."unicode-data"; deps."xmltexconfig" = tl."xmltexconfig"; + hasFormats = true; sha512.run = "e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead"; sha512.doc = "340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb"; hasRunfiles = true; diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 2f30aa69fe2..61150fa8b7c 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -32,3 +32,7 @@ s/^catalogue-version_(.*)/ version = "\1";/p # extract deps s/^depend ([^.]*)$/ deps."\1" = tl."\1";/p +# extract hyphenation patterns and formats +# (this may create duplicate lines, use uniq to remove them) +/^execute\sAddHyphen/i\ hasHyphens = true; +/^execute\sAddFormat/i\ hasFormats = true; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index b30c4b88651..f05c4a43b9c 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,17 +11,17 @@ }: let - specVersion = "4.96.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. + specVersion = "4.98.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "sha256-4+j5BBTOFLLiA+n0YEUH/ICK4Iuxr6nNB7ZRrYACW2I="; + sha256 = "sha256-3SweDMfgq2+QQIdeb6EjL7A2Grd/7KQzsbMNZKPtXts="; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.4.3"; + version = "5.5.1"; src = fetchFromGitHub { owner = "linode"; diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix new file mode 100644 index 00000000000..24a830a7277 --- /dev/null +++ b/pkgs/tools/wayland/swayr/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromSourcehut, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "swayr"; + version = "0.6.1"; + + src = fetchFromSourcehut { + owner = "~tsdh"; + repo = "swayr"; + rev = "v${version}"; + sha256 = "1865064q8jb75nfb0hbx4swbbijpibm0n7m4cid8qgylzp4bxvs2"; + }; + + cargoSha256 = "0w6zjnywifdlaw01xz2824lwm4b6r1b7r99wi3p12vgbrmks4jcr"; + + patches = [ + ./icon-paths.patch + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with lib; { + description = "A window switcher (and more) for sway"; + homepage = "https://git.sr.ht/~tsdh/swayr"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/tools/wayland/swayr/icon-paths.patch new file mode 100644 index 00000000000..8fafc4c4153 --- /dev/null +++ b/pkgs/tools/wayland/swayr/icon-paths.patch @@ -0,0 +1,17 @@ +diff --git a/src/config.rs b/src/config.rs +index de7d04b..291114b 100644 +--- a/src/config.rs ++++ b/src/config.rs +@@ -197,6 +197,12 @@ impl Default for Format { + ), + urgency_end: Some("</span>".to_string()), + icon_dirs: Some(vec![ ++ "/run/current-system/sw/share/icons/hicolor/scalable/apps".to_string(), ++ "/run/current-system/sw/share/icons/hicolor/48x48/apps".to_string(), ++ "/run/current-system/sw/share/pixmaps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/scalable/apps".to_string(), ++ "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(), ++ "~/.nix-profile/share/pixmaps".to_string(), + "/usr/share/icons/hicolor/scalable/apps".to_string(), + "/usr/share/icons/hicolor/48x48/apps".to_string(), + "/usr/share/pixmaps".to_string(), diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df082ff35c..8c59db87b73 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -129,6 +129,7 @@ mapAliases ({ clang12Stdenv = lowPrio llvmPackages_12.stdenv; clangAnalyzer = clang-analyzer; # added 2015-02-20 + claws-mail-gtk3 = claws-mail; # added 2021-07-10 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05 @@ -540,6 +541,7 @@ mapAliases ({ osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70356587f03..cf4670295d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -808,6 +808,8 @@ in afew = callPackage ../applications/networking/mailreaders/afew { }; + afetch = callPackage ../tools/misc/afetch { }; + afio = callPackage ../tools/archivers/afio { }; afl = callPackage ../tools/security/afl { @@ -952,6 +954,8 @@ in lifecycled = callPackage ../tools/misc/lifecycled { }; + lilo = callPackage ../tools/misc/lilo { }; + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; @@ -1235,6 +1239,8 @@ in azure-cli = callPackage ../tools/admin/azure-cli { }; + azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; @@ -1321,6 +1327,8 @@ in inherit (nodePackages) bitwarden-cli; + inherit (nodePackages) hyperspace-cli; + bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; @@ -1564,6 +1572,8 @@ in gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; @@ -1975,6 +1985,8 @@ in tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { }; + tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bfetch = callPackage ../tools/misc/bfetch { }; @@ -2301,6 +2313,8 @@ in swaycwd = callPackage ../tools/wayland/swaycwd { }; + swayr = callPackage ../tools/wayland/swayr { }; + wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; @@ -2481,6 +2495,10 @@ in discourse = callPackage ../servers/web-apps/discourse { }; + discourseAllPlugins = discourse.override { + plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins); + }; + discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { }; discocss = callPackage ../tools/misc/discocss { }; @@ -3067,6 +3085,8 @@ in mq-cli = callPackage ../tools/system/mq-cli { }; + n2n = callPackage ../tools/networking/n2n { }; + nextdns = callPackage ../applications/networking/nextdns { }; ngadmin = callPackage ../applications/networking/ngadmin { }; @@ -3079,7 +3099,9 @@ in nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); - nix-template = callPackage ../tools/package-management/nix-template { }; + nix-template = callPackage ../tools/package-management/nix-template { + inherit (darwin.apple_sdk.frameworks) Security; + }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; @@ -3650,7 +3672,7 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_21_03_0; + citrix_workspace = citrix_workspace_21_06_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -3660,6 +3682,7 @@ in citrix_workspace_20_12_0 citrix_workspace_21_01_0 citrix_workspace_21_03_0 + citrix_workspace_21_06_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -3889,7 +3912,9 @@ in cloud-utils = callPackage ../tools/misc/cloud-utils { }; - cobalt = callPackage ../applications/misc/cobalt { }; + cobalt = callPackage ../applications/misc/cobalt { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; cocoapods = callPackage ../development/mobile/cocoapods { }; @@ -5542,7 +5567,17 @@ in grub2 = grub2_full; - grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20200223"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; + sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; + }; + }); + }; grub2_efi = grub2.override { efiSupport = true; @@ -5562,6 +5597,10 @@ in stdenv = stdenv_32bit; }; + gruut = with python3.pkgs; toPythonApplication gruut; + + gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; + gx = callPackage ../tools/package-management/gx { }; gx-go = callPackage ../tools/package-management/gx/go { }; @@ -5759,6 +5798,8 @@ in heimdall-gui = heimdall.override { enableGUI = true; }; + headscale = callPackage ../servers/headscale { }; + heisenbridge = callPackage ../servers/heisenbridge { }; helio-workstation = callPackage ../applications/audio/helio-workstation { }; @@ -6081,6 +6122,8 @@ in jnettop = callPackage ../tools/networking/jnettop { }; + jsvc = callPackage ../tools/system/jsvc { }; + jumpnbump = callPackage ../games/jumpnbump { }; junkie = callPackage ../tools/networking/junkie { }; @@ -6211,6 +6254,8 @@ in keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; + kfctl = callPackage ../applications/networking/cluster/kfctl { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -6762,9 +6807,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0 - libwebsockets_4_1; - libwebsockets = libwebsockets_3_2; + libwebsockets_4_2; + libwebsockets = libwebsockets_4_2; licensee = callPackage ../tools/package-management/licensee { }; @@ -7271,7 +7315,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud18 nextcloud19 nextcloud20 nextcloud21; + nextcloud19 nextcloud20 nextcloud21 nextcloud22; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -8012,10 +8056,7 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = if stdenv.isDarwin then - callPackage ../applications/virtualization/podman { } - else - callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -8214,8 +8255,6 @@ in quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; - q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; @@ -8447,9 +8486,7 @@ in routino = callPackage ../tools/misc/routino { }; - rq = callPackage ../development/tools/rq { - inherit (darwin) libiconv; - }; + rq = callPackage ../development/tools/rq { }; rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { }; @@ -8587,7 +8624,9 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws {}; + saml2aws = callPackage ../tools/security/saml2aws { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; sammler = callPackage ../tools/security/sammler {}; @@ -9122,6 +9161,10 @@ in squeekboard = callPackage ../applications/accessibility/squeekboard { }; + sx = callPackage ../tools/X11/sx { + inherit (xorg) xauth xorgserver; + }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; @@ -9581,6 +9624,8 @@ in vdmfec = callPackage ../applications/backup/vdmfec {}; + vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { }; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; volatility = callPackage ../tools/security/volatility { }; @@ -10754,6 +10799,8 @@ in fasmg = callPackage ../development/compilers/fasmg { }; + fennel = callPackage ../development/compilers/fennel { }; + flasm = callPackage ../development/compilers/flasm { }; flyctl = callPackage ../development/web/flyctl { }; @@ -12533,7 +12580,7 @@ in python3 = python38; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy36; + pypy3 = pypy37; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -12589,7 +12636,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; + inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37; # Python package sets. python27Packages = python27.pkgs; @@ -13714,6 +13761,8 @@ in augustus = callPackage ../games/augustus { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; kafkacat = callPackage ../development/tools/kafkacat { }; @@ -15066,12 +15115,27 @@ in flite = callPackage ../development/libraries/flite { }; fltk13 = callPackage ../development/libraries/fltk { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; fltk14 = callPackage ../development/libraries/fltk/1.4.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; - fltk = res.fltk13; + fltk13-minimal = fltk13.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk14-minimal = fltk14.override { + withGL = false; + withCairo = false; + withPango = false; + withExamples = false; + withDocs = false; + }; + fltk = fltk13; + fltk-minimal = fltk13-minimal; flyway = callPackage ../development/tools/flyway { }; @@ -15272,6 +15336,9 @@ in }); glfw = glfw3; + glfw-wayland = glfw.override { + waylandSupport = true; + }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; @@ -15900,6 +15967,8 @@ in json2hcl = callPackage ../development/tools/json2hcl { }; + json2yaml = haskell.lib.justStaticExecutables haskellPackages.json2yaml; + json-glib = callPackage ../development/libraries/json-glib { }; json_c = callPackage ../development/libraries/json-c { }; @@ -16468,6 +16537,8 @@ in libgksu = callPackage ../development/libraries/libgksu { }; + libgnt = callPackage ../development/libraries/libgnt { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118 @@ -17610,6 +17681,8 @@ in oobicpl = callPackage ../development/libraries/science/biology/oobicpl { }; + ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; + openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -18993,6 +19066,8 @@ in commonsCompress = callPackage ../development/libraries/java/commons/compress { }; + commonsDaemon = callPackage ../development/libraries/java/commons/daemon { }; + commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { }; commonsLang = callPackage ../development/libraries/java/commons/lang { }; @@ -19479,6 +19554,8 @@ in icecream = callPackage ../servers/icecream { }; + icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { }; + icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; @@ -19498,6 +19575,8 @@ in ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; + janus-gateway = callPackage ../servers/janus-gateway { }; + jboss = callPackage ../servers/http/jboss { }; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; @@ -20236,6 +20315,8 @@ in unifi6; unifi = unifi6; + unifi-video = callPackage ../servers/unifi-video { }; + unpackerr = callPackage ../servers/unpackerr { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; @@ -20662,6 +20743,8 @@ in kbdlight = callPackage ../os-specific/linux/kbdlight { }; + kinect-audio-setup = callPackage ../os-specific/linux/kinect-audio-setup { }; + kmscon = callPackage ../os-specific/linux/kmscon { }; kmscube = callPackage ../os-specific/linux/kmscube { }; @@ -22251,6 +22334,8 @@ in juno-theme = callPackage ../data/themes/juno { }; + kanit-font = callPackage ../data/fonts/kanit { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; @@ -22270,6 +22355,8 @@ in kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; @@ -23107,8 +23194,9 @@ in inherit (pkgs) bitwig-studio1; }; bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { }; - bitwig-studio = bitwig-studio3; + bitwig-studio = bitwig-studio4; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -23278,10 +23366,11 @@ in cipher = callPackage ../applications/misc/cipher { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = false; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = true; }; @@ -24777,6 +24866,8 @@ in icewm = callPackage ../applications/window-managers/icewm {}; + icecat-bin = callPackage ../applications/networking/browsers/icecat-bin { }; + id3v2 = callPackage ../applications/audio/id3v2 { }; ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; @@ -25139,9 +25230,9 @@ in fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; linkerd_edge = (callPackage ../applications/networking/cluster/linkerd { }).edge; - linkerd = linkerd_edge; + linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; + linkerd = linkerd_stable; kile-wl = callPackage ../applications/misc/kile-wl { }; @@ -25652,6 +25743,8 @@ in rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { }; + rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; + ympd = callPackage ../applications/audio/ympd { }; # a somewhat more maintained fork of ympd @@ -25791,6 +25884,8 @@ in nwg-panel = callPackage ../applications/misc/nwg-panel { }; + nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; + ocenaudio = callPackage ../applications/audio/ocenaudio { }; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; @@ -27197,6 +27292,8 @@ in tempo = callPackage ../servers/tracing/tempo {}; + temporal = callPackage ../applications/networking/cluster/temporal { }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = python3Packages.callPackage ../applications/misc/termdown { }; @@ -28314,6 +28411,9 @@ in zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; + # Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build + # with rust 1.53. This should be fixed in the next version. + rustPlatform = rustPackages_1_45.rustPlatform; }; zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; @@ -28407,6 +28507,9 @@ in electrs = callPackage ../applications/blockchains/electrs.nix { }; + elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; + elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; }; + ergo = callPackage ../applications/blockchains/ergo { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -28444,6 +28547,10 @@ in boost = boost17x; }; + oxen = callPackage ../applications/blockchains/oxen { + boost = boost17x; + }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; }; @@ -28738,7 +28845,9 @@ in exult = callPackage ../games/exult { }; - fltrator = callPackage ../games/fltrator { }; + fltrator = callPackage ../games/fltrator { + fltk = fltk-minimal; + }; factorio = callPackage ../games/factorio { releaseType = "alpha"; }; @@ -30973,11 +31082,11 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_18 kops_1_19 kops_1_20 + kops_1_21 ; - kops = kops_1_20; + kops = kops_1_21; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -31897,6 +32006,8 @@ in yamdi = callPackage ../tools/video/yamdi { }; + yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; yara = callPackage ../tools/security/yara { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d168d34e373..34f99561601 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText gcc; inherit lib; }; @@ -44,7 +44,7 @@ let }; emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { - inherit (pkgs) makeWrapper runCommand; + inherit (pkgs) makeWrapper runCommand gcc; inherit (pkgs.xorg) lndir; inherit lib; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8bea40efe64..b872f3286e1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -57,7 +57,8 @@ in { ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 then + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then packages.ghc8102BinaryMinimal else packages.ghc865Binary; @@ -67,7 +68,8 @@ in { }; ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then packages.ghc8102BinaryMinimal else packages.ghc865Binary; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index d0728c5d1b2..c5a5a437699 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -10,9 +10,7 @@ , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } }: -with pkgs; - -releaseTools.sourceTarball { +pkgs.releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; @@ -23,7 +21,7 @@ releaseTools.sourceTarball { then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified) else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; - buildInputs = [ nix.out jq lib-tests pkgs.brotli ]; + buildInputs = with pkgs; [ nix.out jq lib-tests brotli ]; configurePhase = '' eval "$preConfigure" @@ -34,6 +32,9 @@ releaseTools.sourceTarball { echo "git-revision is $(cat .git-revision)" ''; + nixpkgs-basic-release-checks = import ./nixpkgs-basic-release-checks.nix + { inherit nix pkgs nixpkgs supportedSystems; }; + dontBuild = false; doCheck = true; @@ -46,47 +47,6 @@ releaseTools.sourceTarball { opts=(--option build-users-group "") nix-store --init - echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix - - # Make sure that Nixpkgs does not use <nixpkgs>. - badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) - if [[ -n $badFiles ]]; then - echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." - echo "The offending files: $badFiles" - exit 1 - fi - - # Make sure that derivation paths do not depend on the Nixpkgs path. - mkdir $TMPDIR/foo - ln -s $(readlink -f .) $TMPDIR/foo/bar - p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace) - p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) - if [ "$p1" != "$p2" ]; then - echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" - exit 1 - fi - - # Check that all-packages.nix evaluates on a number of platforms without any warnings. - for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do - header "checking Nixpkgs on $platform" - - nix-env -f . \ - --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system \ - "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log - - if [ -s eval-warnings.log ]; then - echo "Nixpkgs on $platform evaluated with warnings, aborting" - exit 1 - fi - rm eval-warnings.log - - nix-env -f . \ - --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system --meta --xml \ - "''${opts[@]}" > /dev/null - done - header "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null @@ -104,7 +64,7 @@ releaseTools.sourceTarball { header "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages @@ -121,6 +81,6 @@ releaseTools.sourceTarball { ''; meta = { - maintainers = [ lib.maintainers.all ]; + maintainers = [ pkgs.lib.maintainers.all ]; }; } diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix new file mode 100644 index 00000000000..ffd92d587ba --- /dev/null +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -0,0 +1,53 @@ +{ supportedSystems, nixpkgs, pkgs, nix }: + +pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } '' + set -o pipefail + + export NIX_STATE_DIR=$TMPDIR + export NIX_PATH=nixpkgs=$TMPDIR/barf.nix + opts=(--option build-users-group "") + nix-store --init + + echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix + + # Make sure that Nixpkgs does not use <nixpkgs>. + badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) + if [[ -n $badFiles ]]; then + echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." + echo "The offending files: $badFiles" + exit 1 + fi + + # Make sure that derivation paths do not depend on the Nixpkgs path. + mkdir $TMPDIR/foo + ln -s $(readlink -f $src) $TMPDIR/foo/bar + p1=$(nix-instantiate $src --dry-run -A firefox --show-trace) + p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) + if [ "$p1" != "$p2" ]; then + echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" + exit 1 + fi + + # Check that all-packages.nix evaluates on a number of platforms without any warnings. + for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do + header "checking Nixpkgs on $platform" + + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log + + if [ -s eval-warnings.log ]; then + echo "Nixpkgs on $platform evaluated with warnings, aborting" + exit 1 + fi + rm eval-warnings.log + + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + -qa --drv-path --system-filter \* --system --meta --xml \ + "''${opts[@]}" > /dev/null + done + + touch $out +'' diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 977d70e7ef1..ebe7465fae5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -78,6 +78,8 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; + bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; bos = callPackage ../development/ocaml-modules/bos { }; @@ -242,6 +244,8 @@ let dap = callPackage ../development/ocaml-modules/dap { }; + data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; diet = callPackage ../development/ocaml-modules/diet { }; @@ -369,6 +373,8 @@ let fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; + ff = callPackage ../development/ocaml-modules/ff { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; @@ -548,6 +554,10 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + json-data-encoding = callPackage ../development/ocaml-modules/json-data-encoding { }; + + json-data-encoding-bson = callPackage ../development/ocaml-modules/json-data-encoding/bson.nix { }; + junit = callPackage ../development/ocaml-modules/junit { }; junit_ounit = callPackage ../development/ocaml-modules/junit/ounit.nix { }; junit_alcotest = callPackage ../development/ocaml-modules/junit/alcotest.nix { }; @@ -620,6 +630,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; @@ -1019,6 +1031,8 @@ let inherit (pkgs) secp256k1; }; + secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; + seq = callPackage ../development/ocaml-modules/seq { }; sosa = callPackage ../development/ocaml-modules/sosa { }; @@ -1153,6 +1167,18 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; + ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { }; + + resto = callPackage ../development/ocaml-modules/resto { }; + resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { }; + resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { }; + resto-cohttp-client = callPackage ../development/ocaml-modules/resto/cohttp-client.nix { }; + resto-cohttp-self-serving-client = callPackage ../development/ocaml-modules/resto/cohttp-self-serving-client.nix { }; + resto-cohttp-server = callPackage ../development/ocaml-modules/resto/cohttp-server.nix { }; + resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { }; + resto-json = callPackage ../development/ocaml-modules/resto/json.nix { }; + rope = callPackage ../development/ocaml-modules/rope { }; routes = callPackage ../development/ocaml-modules/routes { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ec39ab41f0..ff35e523146 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10793,25 +10793,15 @@ let }; }; - ImageExifTool = buildPerlPackage { + ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.16"; + version = "12.29"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz"; - sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61"; + url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; + sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; }; - patches = [ - # Unfortunately, not every release is uploaded to CPAN so security fixes - # would need to be cherry-picked from releases - (fetchpatch { - name = "CVE-2021-22204.patch"; - url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch"; - sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj"; - }) - ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e61983ead9..0ea1e6a456b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1670,6 +1670,8 @@ in { cram = callPackage ../development/python-modules/cram { }; + cramjam = callPackage ../development/python-modules/cramjam { }; + crashtest = callPackage ../development/python-modules/crashtest { }; crate = callPackage ../development/python-modules/crate { }; @@ -3131,6 +3133,10 @@ in { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + gruut = callPackage ../development/python-modules/gruut { }; + + gruut-ipa = callPackage ../development/python-modules/gruut-ipa { }; + gsd = callPackage ../development/python-modules/gsd { }; gspread = callPackage ../development/python-modules/gspread { }; @@ -3386,6 +3392,8 @@ in { hypchat = callPackage ../development/python-modules/hypchat { }; + hypercorn = callPackage ../development/python-modules/hypercorn { }; + hyperframe = callPackage ../development/python-modules/hyperframe { }; hyperion-py = callPackage ../development/python-modules/hyperion-py { }; @@ -4666,6 +4674,8 @@ in { names = callPackage ../development/python-modules/names { }; + nampa = callPackage ../development/python-modules/nampa { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; nanomsg-python = callPackage ../development/python-modules/nanomsg-python { @@ -4979,6 +4989,8 @@ in { openshift = callPackage ../development/python-modules/openshift { }; + opensimplex = callPackage ../development/python-modules/opensimplex { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -5377,6 +5389,8 @@ in { python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; + python-crfsuite = callPackage ../development/python-modules/python-crfsuite { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; @@ -5635,6 +5649,8 @@ in { purl = callPackage ../development/python-modules/purl { }; + push-receiver = callPackage ../development/python-modules/push-receiver { }; + pushbullet = callPackage ../development/python-modules/pushbullet { }; pushover-complete = callPackage ../development/python-modules/pushover-complete { }; @@ -7418,6 +7434,8 @@ in { gdal = pkgs.gdal_2; }; + ratelim = callPackage ../development/python-modules/ratelim { }; + ratelimit = callPackage ../development/python-modules/ratelimit { }; ratelimiter = callPackage ../development/python-modules/ratelimiter { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 60b4609479d..4c3518436de 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { kde2-decoration = callPackage ../data/themes/kde2 { }; + kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; + kdiagram = callPackage ../development/libraries/kdiagram { }; kdsoap = callPackage ../development/libraries/kdsoap { }; kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { }; + kimageannotator = callPackage ../development/libraries/kimageannotator { }; + kproperty = callPackage ../development/libraries/kproperty { }; kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c4db73d416c..fe5241e3634 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -89,11 +89,13 @@ let haskellPackages = packagePlatforms pkgs.haskellPackages; haskell.compiler = packagePlatforms pkgs.haskell.compiler; - tests = let - testPlatforms = packagePlatforms pkgs.tests; - in { - haskell = testPlatforms.haskell; - writers = testPlatforms.writers; + tests.haskell = packagePlatforms pkgs.tests.haskell; + + pkgsMusl.haskell.compiler = packagePlatforms pkgs.pkgsMusl.haskell.compiler // { + # remove musl ghc865Binary since it is known to be broken and + # causes an evaluation error on darwin. + # TODO: remove ghc865Binary altogether and use ghc8102Binary + ghc865Binary = {}; }; # test some statically linked packages to catch regressions @@ -247,11 +249,10 @@ let }; constituents = accumulateDerivations [ # haskell specific tests - jobs.tests.haskell - # writeHaskell and writeHaskellBin - # TODO: writeHaskell currently fails on darwin - jobs.tests.writers.x86_64-linux - jobs.tests.writers.aarch64-linux + # + # TODO: The writers test appears to be failing on darwin for unknown + # reasons. See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881307871. + (lib.recursiveUpdate jobs.tests.haskell { writers.x86_64-darwin = null; }) # important top-level packages jobs.cabal-install jobs.cabal2nix @@ -309,6 +310,21 @@ let jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; + muslGHCs = pkgs.releaseTools.aggregate { + name = "haskell-pkgsMusl-ghcs"; + meta = { + description = "GHCs built with musl"; + maintainers = with lib.maintainers; [ + nh2 + ]; + }; + constituents = accumulateDerivations [ + jobs.pkgsMusl.haskell.compiler.ghc8102Binary + jobs.pkgsMusl.haskell.compiler.ghc884 + jobs.pkgsMusl.haskell.compiler.ghc8104 + jobs.pkgsMusl.haskell.compiler.ghc901 + ]; + }; } ]; |