diff options
164 files changed, 5014 insertions, 3700 deletions
diff --git a/.github/labeler.yml b/.github/labeler.yml index 3637d05f48b..5dd885552d6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -36,11 +36,11 @@ "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - - nixos/modules/services/desktops/gnome3/**/* - - nixos/modules/services/x11/desktop-managers/gnome3.nix - - nixos/tests/gnome3-xorg.nix - - nixos/tests/gnome3.nix - - pkgs/desktops/gnome-3/**/* + - nixos/modules/services/desktops/gnome/**/* + - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/tests/gnome-xorg.nix + - nixos/tests/gnome.nix + - pkgs/desktops/gnome/**/* "6.topic: golang": - doc/languages-frameworks/go.section.md diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7ff4d03b765..2da788a56af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1322,6 +1322,12 @@ github = "bmilanov"; githubId = 30090366; }; + bmwalters = { + name = "Bradley Walters"; + email = "oss@walters.app"; + github = "bmwalters"; + githubId = 4380777; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; @@ -6380,6 +6386,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdsp = { + github = "Mdsp9070"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha2001@outlook.com"; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 471447e60d5..3772b230f86 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -155,7 +155,7 @@ getMaintainerMap = do get c p i e = readProcess c p i <&> \x -> either (error . (<> " Raw:'" <> take 1000 x <> "'") . (e <>)) Prelude.id . eitherDecodeStrict' . encodeUtf8 . Text.pack $ x -- BuildStates are sorted by subjective importance/concerningness -data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | Unfinished | Success deriving (Show, Eq, Ord) +data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | HydraFailure | Unfinished | Success deriving (Show, Eq, Ord) icon :: BuildState -> Text icon = \case @@ -166,6 +166,7 @@ icon = \case TimedOut -> ":hourglass::no_entry_sign:" Canceled -> ":no_entry_sign:" Unfinished -> ":hourglass_flowing_sand:" + HydraFailure -> ":construction:" Success -> ":heavy_check_mark:" platformIcon :: Platform -> Text @@ -199,10 +200,11 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap state = case (finished, buildstatus) of (0, _) -> Unfinished (_, Just 0) -> Success + (_, Just 1) -> Failed + (_, Just 2) -> DependencyFailed + (_, Just 3) -> HydraFailure (_, Just 4) -> Canceled (_, Just 7) -> TimedOut - (_, Just 2) -> DependencyFailed - (_, Just 1) -> Failed (_, Just 11) -> OutputLimitExceeded (_, i) -> Unknown i packageName = fromMaybe job (Text.stripSuffix ("." <> system) job) diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index ce1dabe6bfa..6ea73fa5c67 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -8,6 +8,18 @@ let username = config.users.users.mirakurun.name; groupname = config.users.users.mirakurun.group; settingsFmt = pkgs.formats.yaml {}; + + polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" '' + polkit.addRule(function (action, subject) { + if ( + (action.id == "org.debian.pcsc-lite.access_pcsc" || + action.id == "org.debian.pcsc-lite.access_card") && + subject.user == "${username}" + ) { + return polkit.Result.YES; + } + }); + ''; in { options = { @@ -48,6 +60,15 @@ in ''; }; + allowSmartCardAccess = mkOption { + type = types.bool; + default = true; + description = '' + Install polkit rules to allow Mirakurun to access smart card readers + which is commonly used along with tuner devices. + ''; + }; + serverSettings = mkOption { type = settingsFmt.type; default = {}; @@ -110,7 +131,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ mirakurun ]; + environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule; environment.etc = { "mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings; "mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) { diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 17089141e9e..a300609cf2b 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ with pkgs; { linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; + linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index 412ed59f2ac..a45238fd191 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchgit, emacs }: +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { - name = "sunrise-commander-6r435"; +stdenv.mkDerivation rec { + pname = "sunrise-commander"; + version = "0.0.0-unstable=2021-04-23"; - src = fetchgit { - url = "https://github.com/escherdragon/sunrise-commander.git"; - rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; - sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "db880fbea03d2db00db1398c91918c3c6f0392e3"; + hash = "sha256-IGHCKYQaGUapaA9vxq0xO58KCpBPOiQpHqrEaHK0usE="; }; - buildInputs = [ emacs ]; + buildInputs = [ + emacs + ]; buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el + runHook preBuild + emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/share/emacs/site-lisp install *.el* $out/share/emacs/site-lisp + runHook postInstall ''; - meta = { + meta = with lib; { + homepage = "https://github.com/sunrise-commander/sunrise-commander/"; description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; - homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e15585d7bcf..12995d3c5fe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg"; - x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386"; - aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07"; - armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6"; + x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4"; + x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy"; + aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j"; + armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9bd8e0f245b..decd4b10042 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 = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2"; - x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb"; - aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w"; - armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4"; + x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76"; + x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m"; + aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn"; + armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index f45bff666cf..afe15949ee8 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src - zcat Payload | cpio -i + zcat op.pkg/Payload | cpio -i ''; installPhase = '' diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 23d34f30d64..95b4838e3e7 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv +{ lib +, stdenv , autoconf , automake , c-ares , cryptopp , curl , fetchFromGitHub -, ffmpeg_3 +, ffmpeg_3 # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523 , freeimage , gcc-unwrapped , libmediainfo @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr"; + sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; fetchSubmodules = true; }; @@ -49,7 +50,6 @@ stdenv.mkDerivation rec { libmediainfo libraw libsodium - libtool libuv libzen pcre-cpp @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/"; - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.wedens ]; + homepage = "https://mega.nz/cmd"; + license = with licenses; [ bsd2 gpl3Only ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ lunik1 ]; }; } diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 028b5c686f4..9b96fea718b 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-qcfSGV/+FkyWGAApekRZHWGmeB9gIURt11DKn7lEh+o="; + sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ="; }; - cargoSha256 = "sha256-HpGzDZMIzO0lpussmm+kJNOU7zghcYrQWZo3WZ5FOmA="; + cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index d7906c7dcbd..39044301ec7 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,17 +30,18 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.13"; + version = "0.12.3"; src = fetchurl { - url = - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI="; + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; + sha256 = "sha256-nwtQp7BkMZwMzfnA5wdcMAhfezM//Lm9cf0pbvnOVZE="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin makeWrapper ${electron}/bin/electron $out/bin/obsidian \ @@ -56,6 +57,8 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png done + + runHook postInstall ''; passthru.updateScript = updateScript; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2bc293eaaf..f84ce23309f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, python3Packages, perl, pkg-config +, python2, python3, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -43,16 +43,12 @@ with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py" - # currently doesn't work due to mixed Python 2/3 dependencies: - pythonPackages = if chromiumVersionAtLeast "93" - then python3Packages - else python2Packages; - forcePython3Patch = (githubPatch - # Reland #8 of "Force Python 3 to be used in build."": - "a2d3c362802d9e6b62f895fcda75a3695b77b1b8" - "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2" - ); + python2WithPackages = python2.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); + python3WithPackages = python3.withPackages(ps: with ps; [ + ply jinja2 setuptools + ]); # The additional attributes for creating derivations based on the chromium # source tree. @@ -138,10 +134,12 @@ let }; nativeBuildInputs = [ + ninja pkg-config + python2WithPackages perl nodejs + gnutar which llvmPackages.lldClang.bintools - ninja which pythonPackages.python perl pkg-config - pythonPackages.ply pythonPackages.jinja2 nodejs - gnutar pythonPackages.setuptools + ] ++ lib.optionals (chromiumVersionAtLeast "92") [ + python3WithPackages ]; buildInputs = defaultDependencies ++ [ @@ -174,8 +172,6 @@ let postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' # Required for patchShebangs (unsupported): chmod -x third_party/webgpu-cts/src/tools/deno - '' + optionalString (chromiumVersionAtLeast "92") '' - patch -p1 --reverse < ${forcePython3Patch} '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do @@ -313,7 +309,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index cbd45bfbd19..42b3feebfe2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "92.0.4496.0", - "sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi", - "sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr", + "version": "92.0.4503.0", + "sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb", + "sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm", "deps": { "gn": { - "version": "2021-04-29", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e", - "sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } } }, diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 4053a042bfa..878d7e1184f 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,14 +44,16 @@ 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.20.6+k3s1"; # k3s git tag - traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag - k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag + k3sVersion = "1.21.0+k3s1"; # k3s git tag + k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # 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 + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS # bundled into the k3s binary traefikChart = fetchurl { - url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; - sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9"; + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; }; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -95,8 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ="; + sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -134,9 +135,13 @@ let # those. patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; + # Versioning info for build script + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + buildPhase = '' pushd go/src/${goPackagePath} @@ -175,7 +180,7 @@ let # See the above comment in k3sBuildStage1 patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config zstd ]; + nativeBuildInputs = [ pkg-config zstd ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; @@ -186,6 +191,9 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 6f97be468f5..ff86b64fec7 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.19.0"; + version = "0.20.0"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA="; - aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38="; - x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I="; + x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; + aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; + x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 5917d9ce033..8bc76834752 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.19.0"; + version = "0.20.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-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0="; - x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U="; + x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y="; + x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8="; }.${system}; }; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 89802f12be5..67fde535f56 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,26 +2,25 @@ buildGoModule rec { pname = "popeye"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "1rslmcdjs53zvv0xaf00vxqsfc3jh2p584j3q6nfgrghc978xmpf"; + sha256 = "sha256-GSH9q0hnyuGiJAdbFWKbaaYoHKl4e0SNmBkOvpn5a6s="; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=022c3104b642aab6bdb287468fb79068a33e1b0d - -X github.com/derailed/popeye/cmd.date=2020-10-31T16:44:45Z + -X github.com/derailed/popeye/cmd.commit=${version} ''; - vendorSha256 = "08195dnka7rs38py3kjii9zh9nifg2fnbi1wzjl0pc38i2bbrz0k"; + vendorSha256 = "sha256-pK04vGL9Izv1aK8UA+/3lSt/SjLyckjnfSCrOalRj3c="; - doCheck = false; + doCheck = true; meta = with lib; { description = "A Kubernetes cluster resource sanitizer"; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 313bd46a519..54520b54c88 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQFPuHxfFvfwPVV0vPeA+A6XCw2Vt4tY4S2JBGcqaBQ="; + sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg="; }; - vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk="; + vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33fba6e5a0f..f941b83eb70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -76,28 +76,31 @@ "version": "3.27.0" }, "azuread": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v0.10.0", - "sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3", - "version": "0.10.0" + "rev": "v1.4.0", + "sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209", + "vendorSha256": null, + "version": "1.4.0" }, "azurerm": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.13.0", - "sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7", - "version": "2.13.0" + "rev": "v2.58.0", + "sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh", + "vendorSha256": null, + "version": "2.58.0" }, "azurestack": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", - "rev": "v0.9.0", - "sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324", - "version": "0.9.0" + "rev": "v0.10.0", + "sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8", + "vendorSha256": null, + "version": "0.10.0" }, "baiducloud": { "owner": "terraform-providers", @@ -495,6 +498,7 @@ }, "keycloak": { "owner": "mrparkers", + "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v3.0.0", "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index e1f070eaa9a..45a03ef1fe5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.26", + "version": "1.7.27", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -12,6 +12,9 @@ "license": "Apache-2.0", "files": [], "scripts": { + "i18n": "matrix-gen-i18n", + "prunei18n": "matrix-prune-i18n", + "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "mkdirs": "mkdirp packages deploys", "fetch": "yarn run mkdirs && node scripts/fetch-package.js", "asar-webapp": "asar p webapp webapp.asar", @@ -31,6 +34,7 @@ }, "dependencies": { "auto-launch": "^5.0.5", + "counterpart": "^0.18.6", "electron-store": "^6.0.1", "electron-window-state": "^5.0.3", "minimist": "^1.2.3", @@ -48,6 +52,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", + "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 2c254f78372..7d26fbbbff7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -34,6 +34,14 @@ }; } { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + }; + } + { name = "_babel_generator___generator_7.10.5.tgz"; path = fetchurl { name = "_babel_generator___generator_7.10.5.tgz"; @@ -42,6 +50,14 @@ }; } { + name = "_babel_generator___generator_7.13.16.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz"; + sha1 = "0befc287031a201d84cdfc173b46b320ae472d14"; + }; + } + { name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; @@ -50,6 +66,14 @@ }; } { + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; + }; + } + { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; @@ -58,6 +82,14 @@ }; } { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + }; + } + { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; path = fetchurl { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; @@ -66,6 +98,14 @@ }; } { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + }; + } + { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; @@ -74,6 +114,14 @@ }; } { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + }; + } + { name = "_babel_highlight___highlight_7.5.0.tgz"; path = fetchurl { name = "_babel_highlight___highlight_7.5.0.tgz"; @@ -90,6 +138,14 @@ }; } { + name = "_babel_highlight___highlight_7.13.10.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; + sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; + }; + } + { name = "_babel_parser___parser_7.10.5.tgz"; path = fetchurl { name = "_babel_parser___parser_7.10.5.tgz"; @@ -98,6 +154,14 @@ }; } { + name = "_babel_parser___parser_7.13.16.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz"; + sha1 = "0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"; + }; + } + { name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { name = "_babel_runtime___runtime_7.11.2.tgz"; @@ -114,6 +178,22 @@ }; } { + name = "_babel_template___template_7.12.13.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + }; + } + { + name = "_babel_traverse___traverse_7.13.17.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz"; + sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3"; + }; + } + { name = "_babel_traverse___traverse_7.10.5.tgz"; path = fetchurl { name = "_babel_traverse___traverse_7.10.5.tgz"; @@ -130,6 +210,14 @@ }; } { + name = "_babel_types___types_7.13.17.tgz"; + path = fetchurl { + name = "_babel_types___types_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz"; + sha1 = "48010a115c9fba7588b4437dd68c9469012b38b4"; + }; + } + { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; @@ -1666,6 +1754,14 @@ }; } { + name = "counterpart___counterpart_0.18.6.tgz"; + path = fetchurl { + name = "counterpart___counterpart_0.18.6.tgz"; + url = "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz"; + sha1 = "cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"; + }; + } + { name = "crc_32___crc_32_1.2.0.tgz"; path = fetchurl { name = "crc_32___crc_32_1.2.0.tgz"; @@ -1762,6 +1858,14 @@ }; } { + name = "date_names___date_names_0.1.13.tgz"; + path = fetchurl { + name = "date_names___date_names_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/date-names/-/date-names-0.1.13.tgz"; + sha1 = "c4358f6f77c8056e2f5ea68fdbb05f0bf1e53bd0"; + }; + } + { name = "debounce_fn___debounce_fn_4.0.0.tgz"; path = fetchurl { name = "debounce_fn___debounce_fn_4.0.0.tgz"; @@ -2522,6 +2626,14 @@ }; } { + name = "except___except_0.1.3.tgz"; + path = fetchurl { + name = "except___except_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz"; + sha1 = "98261c91958551536b44482238e9783fb73d292a"; + }; + } + { name = "execa___execa_0.7.0.tgz"; path = fetchurl { name = "execa___execa_0.7.0.tgz"; @@ -2610,11 +2722,11 @@ }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { @@ -2698,6 +2810,14 @@ }; } { + name = "foreachasync___foreachasync_3.0.0.tgz"; + path = fetchurl { + name = "foreachasync___foreachasync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }; + } + { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { name = "forever_agent___forever_agent_0.6.1.tgz"; @@ -3266,6 +3386,14 @@ }; } { + name = "indexof___indexof_0.0.1.tgz"; + path = fetchurl { + name = "indexof___indexof_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + } + { name = "infer_owner___infer_owner_1.0.4.tgz"; path = fetchurl { name = "infer_owner___infer_owner_1.0.4.tgz"; @@ -4218,6 +4346,14 @@ }; } { + name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; + path = fetchurl { + name = "63f9119bc0bc304e83d4e8e22364caa7850e7671"; + url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/63f9119bc0bc304e83d4e8e22364caa7850e7671"; + sha1 = "17709c5ad5da065d2718fffe873b8d0a1a53a4cd"; + }; + } + { name = "meant___meant_1.0.3.tgz"; path = fetchurl { name = "meant___meant_1.0.3.tgz"; @@ -4426,6 +4562,14 @@ }; } { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { name = "mute_stream___mute_stream_0.0.8.tgz"; @@ -5130,6 +5274,14 @@ }; } { + name = "pluralizers___pluralizers_0.1.7.tgz"; + path = fetchurl { + name = "pluralizers___pluralizers_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz"; + sha1 = "8d38dd0a1b660e739b10ab2eab10b684c9d50142"; + }; + } + { name = "png_to_ico___png_to_ico_2.1.1.tgz"; path = fetchurl { name = "png_to_ico___png_to_ico_2.1.1.tgz"; @@ -6002,6 +6154,14 @@ }; } { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + }; + } + { name = "sprintf_js___sprintf_js_1.0.3.tgz"; path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; @@ -6018,11 +6178,11 @@ }; } { - name = "ssri___ssri_6.0.1.tgz"; + name = "ssri___ssri_6.0.2.tgz"; path = fetchurl { - name = "ssri___ssri_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; - sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; }; } { @@ -6802,6 +6962,14 @@ }; } { + name = "walk___walk_2.3.14.tgz"; + path = fetchurl { + name = "walk___walk_2.3.14.tgz"; + url = "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz"; + sha1 = "60ec8631cfd23276ae1e7363ce11d626452e1ef3"; + }; + } + { name = "wcwidth___wcwidth_1.0.1.tgz"; path = fetchurl { name = "wcwidth___wcwidth_1.0.1.tgz"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 2a7e01e5291..ad319fcaede 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.26"; + version = "1.7.27"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "1iflsvzn36mywpzags55kjmyq71c3i7f1hgcdcp2ijmnrjk8fy3n"; + sha256 = "0rgsc2cc1v6gjsklwvsjlqq9a8j9j80h9ac0jkvf9lhq33f3c57k"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 9f077c83377..8fcb9bcd2b2 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.26"; + version = "1.7.27"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "17y6wq6w1yk7r1rfply549kpilfraizahf67p00ra7cws66iqkwg"; + sha256 = "004b1cjw8fqk0ixm0wnbk4y51cby1i7avsas95sfm2zsbnbwg519"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d4a72e657cd..50161f1be14 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.0.0"; # Please backport all updates to the stable channel. + version = "5.1.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: @@ -35,7 +35,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 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g"; + sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1"; }; nativeBuildInputs = [ @@ -79,6 +79,7 @@ in stdenv.mkDerivation rec { pango systemd xorg.libxcb + xorg.libxshmfence ]; runtimeDependencies = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d94801df95..3a22ea0681e 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,13 +22,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.24.4059"; - x86_64-linux = "3.24.2939"; + x86_64-darwin = "3.25.4095"; + x86_64-linux = "3.25.2940"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy"; - x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p"; + x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j"; + x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8"; }.${system} or throwSystem; meta = with lib; { diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 0d0144fbf91..ab698ea9c56 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv }: +{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "communi"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake ] + ++ lib.optional stdenv.isDarwin wrapQtAppsHook; buildInputs = [ libcommuni qtbase ]; @@ -25,14 +26,23 @@ stdenv.mkDerivation rec { qmakeFlags = [ "COMMUNI_INSTALL_PREFIX=${placeholder "out"}" - "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" "COMMUNI_INSTALL_PLUGINS=${placeholder "out"}/lib/communi/plugins" "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" + (if stdenv.isDarwin + then [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/Applications" ] + else [ "COMMUNI_INSTALL_BINS=${placeholder "out"}/bin" ]) ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = if stdenv.isDarwin then '' + # Nix qmake does not add the bundle rpath by default. + install_name_tool \ + -add_rpath @executable_path/../Frameworks \ + $out/Applications/Communi.app/Contents/MacOS/Communi + + wrapQtApp $out/Applications/Communi.app/Contents/MacOS/Communi + '' else '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 0e779d6654e..4a741ab2b16 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript -, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg +, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext libGLU libGL freetype fontconfig - polkit polkit_gnome pulseaudio + gnome2.gtkglext libGLU libGL minizip freetype + fontconfig polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst libXt libICE libSM libXrender diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index c305c771417..b6e318ec083 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,13 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; + sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz"; }; postInstall = '' diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 3b3d8a58b56..c309423f142 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , makeWrapper , readline , gmp @@ -35,7 +34,7 @@ let "autpgrp-*" "alnuth-*" "crisp-*" - "ctbllib" + "ctbllib-*" "FactInt-*" "fga" "irredsol-*" @@ -62,11 +61,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { - url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; - sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI="; + url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; + sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ="; }; # remove all non-essential packages (which take up a lot of space) @@ -84,23 +83,6 @@ stdenv.mkDerivation rec { makeWrapper ]; - patches = [ - # Fix for locale specific tests causing issues. Already upstream. - # Backport of https://github.com/gap-system/gap/pull/4022 - (fetchpatch { - name = "remove-locale-specific-tests.patch"; - url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch"; - sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0="; - }) - - # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965 - (fetchpatch { - name = "mark-genstackfuncbags-as-noinline.patch"; - url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch"; - sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY="; - }) - ]; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. # tests are run twice, once with all packages loaded and once without # checkTarget = "teststandard"; diff --git a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch deleted file mode 100644 index 3a2f7231c09..00000000000 --- a/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gasman.c b/src/gasman.c -index 417811401..314a74190 100644 ---- a/src/gasman.c -+++ b/src/gasman.c -@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void ) - #endif - - --void GenStackFuncBags ( void ) -+NOINLINE void GenStackFuncBags ( void ) - { - Bag * top; /* top of stack */ - Bag * p; /* loop variable */ diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 9cdcd2b9ea3..54e26cd2ee8 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -22,23 +22,44 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "handle_factor.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3.rc3"; - sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; - }) + # 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.rc3"; + 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.rc3"; + 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 = [ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 91e855777f0..ecbda8f239a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -24,14 +24,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.3.rc4"; + version = "9.3"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-LDY07By2j6JagkgT9zeDJ93+m2/oXXEnDRTDzmR8ftk="; + sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo="; }; # Patches needed because of particularities of nix or the way this is packaged. diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 695af3d1744..df298aab211 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { owner = "Singular"; repo = "Singular"; - # 4.2.0p2 is not tagged, but the tarball matches commit - # 6f68939ddf612d96e3caaaaa8275f77613ac1da8. the commit below has - # two extra fixes. - rev = "3cda50c00a849455efa2502e56596955491a353a"; - sha256 = "sha256-OizPhGE6L2LTOrKfeDdDB6BSdvYkDVXvbbYjV14hnHM="; + # 4.2.0p2 is not tagged, but the tarball matches the commit below. + rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8"; + sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8="; # if a release is tagged it will be in the format below. # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; @@ -60,6 +58,13 @@ stdenv.mkDerivation rec { # https://github.com/alsa-project/alsa-firmware/issues/3 for a # related issue. ./use-older-ax-prog-cc-for-build.patch + + # https://github.com/Singular/Singular/issues/1086 + (fetchpatch { + name = "schubert-lib-fails-with-too-many-cpus.patch"; + url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch"; + sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA="; + }) ] ++ lib.optionals enableDocs [ # singular supports building without 4ti2, bertini, normaliz or # topcom just fine, but the docbuilding does not skip manual pages @@ -67,6 +72,13 @@ stdenv.mkDerivation rec { # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" # argumens). skip them manually. ./disable-docs-for-optional-unpackaged-deps.patch + + # fix some non-ascii characters in doc/decodegb.doc + (fetchpatch { + name = "decodegb-ascii.patch"; + url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch"; + sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw="; + }) ]; configureFlags = [ @@ -83,9 +95,6 @@ stdenv.mkDerivation rec { substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner' patchShebangs . - '' + lib.optionalString enableDocs '' - # work around encoding problem - sed -i -e 's/\xb7/@cdot{}/g' doc/decodegb.doc ''; # For reference (last checked on commit 75f460d): @@ -149,7 +158,7 @@ stdenv.mkDerivation rec { # singular tests are a bit complicated, see # https://github.com/Singular/Singular/tree/spielwiese/Tst - # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + # https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773 testsToRun = [ "Old/universal.lst" "Buch/buch.lst" @@ -181,7 +190,7 @@ stdenv.mkDerivation rec { 2>"$TMPDIR/out-err.log" # unfortunately regress.cmd always returns exit code 0, so check stderr - # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + # https://www.singular.uni-kl.de/forum/viewtopic.php?f=10&t=2773 if [[ -s "$TMPDIR/out-err.log" ]]; then cat "$TMPDIR/out-err.log" exit 1 diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 9e2afe57907..70b8311b105 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -1,24 +1,41 @@ -{ lib, stdenv, fetchurl -, libX11, libXext, libXaw -, pkg-config, imlib2, libast }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, imlib2 +, libX11 +, libXaw +, libXext +, libast +, pkg-config +}: stdenv.mkDerivation rec { pname = "eterm"; - version = "0.9.6"; - srcName = "Eterm-${version}"; + version = "0.9.6-unstable=2020-03-03"; - src = fetchurl { - url = "http://www.eterm.org/download/${srcName}.tar.gz"; - sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj"; + src = fetchFromGitHub { + owner = "mej"; + repo = pname; + rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c"; + sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXext libXaw imlib2 ]; - propagatedBuildInputs = [ libast ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + imlib2 + libX11 + libXaw + libXext + libast + ]; meta = with lib; { - description = "Terminal emulator"; homepage = "http://www.eterm.org"; + description = "Terminal emulator"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 65865c31dfc..335b8c19172 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: +{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }: with python3Packages; buildPythonApplication rec { @@ -21,7 +21,7 @@ buildPythonApplication rec { strictDeps = false; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) ''; # no tests diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 7a58db2bbd9..043c9f44bcf 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc="; + sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"; }; - cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU="; + cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 8f1a920296a..0dc962e84c5 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.2.0"; + version = "2.3.4"; src = fetchFromGitHub { - owner = "bbidulock"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4="; + hash = "sha256-UyLefj0eY/m3Of51NdhMNMq3z+kaLK28zDe63hbDK5A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 319023eb2e5..964828fdaba 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -14,6 +14,7 @@ let baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then + export XDG_CURRENT_DESKTOP=sway ${extraSessionCommands} export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index 19438d83566..93a0d75aaf6 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -7,9 +7,7 @@ stdenv.mkDerivation rec { version = "20210214"; src = fetchurl { - url = "https://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2"; - # TODO: switch to the url below once Sage 9.3 is released - # url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; + url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; sha256 = "sha256-ByN8DZhTYRUFw4n9e7klAMh0P1YxurtND0Xf2DMvN0E="; }; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5b720404385..66830ea017c 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", - "sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", - "msg": "Update from Hackage at 2021-05-07T19:29:19Z" + "commit": "b963dde27c24394c4be0031039dae4cb6a363aed", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b963dde27c24394c4be0031039dae4cb6a363aed.tar.gz", + "sha256": "1yr9j4ldpi2p2zgdq4mky6y5yh7nilasdmskapbdxp9fxwba2r0x", + "msg": "Update from Hackage at 2021-05-10T22:01:59Z" } diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 8893846698e..bdd7c9cc1a3 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab +, nix-update-script , pkg-config -, gnome , itstool , gtk3 , wrapGAppsHook @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.13"; + version = "3.22.16"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "05k84bbgrrxchxg08l1jjcz384kpjdmxd24g0wnf731aa9zcnp5k"; + sha256 = "0arjnm5kgnb4pir53hlm94iym80d0srs256sm2hwhwwc5fr1w79i"; }; nativeBuildInputs = [ @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 19b5c122d9e..f63ecd95083 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -35,6 +35,8 @@ let fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; + erlang-ls = callPackage ./erlang-ls { }; + # BEAM-based languages. elixir = elixir_1_11; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix new file mode 100644 index 00000000000..3f2ae6e7e2f --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }: +let + version = "0.15.0"; + owner = "erlang-ls"; + repo = "erlang_ls"; + deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; }; +in stdenv.mkDerivation { + inherit version; + pname = "erlang-ls"; + buildInputs = [ (rebar3WithPlugins { }) ]; + src = fetchFromGitHub { + inherit owner repo; + sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; + rev = version; + }; + buildPhase = '' + mkdir _checkouts + ${toString (lib.mapAttrsToList (k: v: '' + cp -R ${v} _checkouts/${k} + '') deps)} + make + ''; + installPhase = '' + mkdir -p $out/bin + cp _build/default/bin/erlang_ls $out/bin/ + cp _build/dap/bin/els_dap $out/bin/ + ''; + meta = with lib; { + homepage = "https://github.com/erlang-ls/erlang_ls"; + description = "The Erlang Language Server"; + platforms = platforms.unix; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix new file mode 100644 index 00000000000..9de79e52be6 --- /dev/null +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -0,0 +1,90 @@ +# Generated by rebar3_nix +{ fetchHex, fetchFromGitHub }: +{ + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + zipper = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + quickrand = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + katana_code = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + bucs = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + yamerl = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + uuid = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + tdiff = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + redbug = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + rebar3_format = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + ranch = fetchHex { + pkg = "ranch"; + version = "1.7.1"; + sha256 = "sha256-RR2FJ3h99xbZncNhYvygWTSRXbC2FBu9rC6o08evx9c="; + }; + jsx = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + erlfmt = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + ephemeral = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + elvis_core = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + docsh = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; +} diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index addf6413801..cb4cf580a0e 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { # Add the packInstall path to the swipl pack search path postPatch = '' - echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> /build/$sourceRoot/boot/init.pl + echo "user:file_search_path(pack, '$out/lib/swipl/pack')." >> boot/init.pl ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7668d854bb2..a7a72f09cf8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1783,10 +1783,6 @@ self: super: { ihaskell-display = doJailbreak super.ihaskell-display; ihaskell-basic = doJailbreak super.ihaskell-basic; - # too strict bounds on QuickCheck - # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42 - hyper-extra = doJailbreak super.hyper-extra; - # Fixes too strict version bounds on regex libraries # Presumably to be removed at the next release yi-language = appendPatch super.yi-language (pkgs.fetchpatch { @@ -1844,8 +1840,6 @@ self: super: { }; }; - phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch; - # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 87fdeb4da2d..256857b033c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4183,6 +4183,7 @@ broken-packages: - simple-ui - simple-units - simple-vec3 + - simplexmq - simple-zipper - singleton-dict - singletons-th diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index cc33944d1ee..e1031bc7255 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,6 +77,14 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # + # 2021-05-11: the diagrams libraries still depends on pre 0.6, + # e. g. https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin presumably until base 4.15 + - monoid-extras < 0.6 + # 2021-05-11: Pin for hls 1.1.0 + - ghcide == 1.2.* + - hls-plugin-api == 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index cdae5528cc2..bb66df5b155 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-05-07 +# Stackage Nightly 2021-05-10 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -355,6 +355,7 @@ default-package-overrides: - cayley-client ==0.4.15 - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 + - cdar-mBound ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -408,7 +409,7 @@ default-package-overrides: - cmdargs ==0.10.21 - codec-beam ==0.2.0 - code-page ==0.2.1 - - collect-errors ==0.1.0.0 + - collect-errors ==0.1.1.0 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - Color ==0.3.1 @@ -985,7 +986,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.4.1 - haskeline ==0.8.1.2 - - haskell-awk ==1.2 + - haskell-awk ==1.2.0.1 - haskell-gi ==0.24.7 - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 @@ -1044,7 +1045,7 @@ default-package-overrides: - hint ==0.9.0.4 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - - hkgr ==0.2.7 + - hkgr ==0.3 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 @@ -1106,7 +1107,7 @@ default-package-overrides: - hspec-expectations-json ==1.0.0.3 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 - - hspec-golden ==0.2.0.0 + - hspec-golden ==0.1.0.3 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.0.0.2 @@ -1200,7 +1201,7 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - - hyper ==0.2.1.0 + - hyper ==0.2.1.1 - hyperloglog ==0.4.4 - hyphenation ==0.8.1 - iconv ==0.4.1.3 @@ -1317,7 +1318,7 @@ default-package-overrides: - kind-generics ==0.4.1.0 - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 - - koji ==0.0.1 + - koji ==0.0.2 - koofr-client ==1.0.0.3 - krank ==0.2.2 - kubernetes-webhook-haskell ==0.2.0.3 @@ -1491,7 +1492,7 @@ default-package-overrides: - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.1 + - mixed-types-num ==0.5.0.3 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1570,7 +1571,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.0.1 - - mysql-simple ==0.4.5 + - mysql-simple ==0.4.6 - n2o ==0.11.1 - nagios-check ==0.3.2 - names-th ==0.3.0.1 @@ -1755,7 +1756,7 @@ default-package-overrides: - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 - - pipes ==4.3.15 + - pipes ==4.3.16 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1864,7 +1865,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.1 + - pusher-http-haskell ==2.1.0.2 - pvar ==1.0.0.0 - PyF ==0.9.0.3 - qchas ==1.1.0.1 @@ -2179,7 +2180,7 @@ default-package-overrides: - splint ==1.0.1.4 - split ==0.2.3.4 - splitmix ==0.1.0.3 - - splitmix-distributions ==0.7.0.0 + - splitmix-distributions ==0.8.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - sqlcli ==0.2.2.0 @@ -2187,9 +2188,9 @@ default-package-overrides: - sqlite-simple ==0.4.18.0 - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - - squeather ==0.6.0.0 + - squeather ==0.8.0.0 - srcloc ==0.6 - - stache ==2.2.1 + - stache ==2.3.0 - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 @@ -2491,7 +2492,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.14 + - unliftio ==0.2.15 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2665,7 +2666,7 @@ default-package-overrides: - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.6 - yesod-paginator ==1.1.1.0 - - yesod-persistent ==1.6.0.6 + - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d04023b09e8..472730a45f1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6430,24 +6430,18 @@ self: { }) {}; "Frames-streamly" = callPackage - ({ mkDerivation, base, binary, bytestring - , bytestring-strict-builder, cereal, clock, exceptions - , fast-builder, foldl, Frames, mtl, primitive, relude, streamly - , streamly-bytestring, strict, text, vector, vinyl + ({ mkDerivation, base, exceptions, Frames, primitive, relude + , streamly, strict, text, vinyl }: mkDerivation { pname = "Frames-streamly"; - version = "0.1.1.0"; - sha256 = "16cxgar58q9gfbs8apl4a9z3ghdxb6m042di7hwhldqy0gn584fp"; + version = "0.1.1.1"; + sha256 = "05al2v7wivvpwxq0gxypbm30ch4ssxmxw1wl4k9az3dqfvr0xgal"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base exceptions Frames primitive relude streamly strict text vinyl ]; - testHaskellDepends = [ - base binary bytestring bytestring-strict-builder cereal clock - fast-builder foldl Frames mtl primitive relude streamly - streamly-bytestring strict text vector vinyl - ]; + testHaskellDepends = [ base Frames streamly text vinyl ]; description = "A streamly layer for Frames I/O"; license = lib.licenses.bsd3; }) {}; @@ -10966,8 +10960,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.0.3"; - sha256 = "0lk34g47iid2cfcj9zfdwbkpvhfhanh83jzh64r9sdrqgw9p25w3"; + version = "0.1.0"; + sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -21763,8 +21757,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.1.0"; - sha256 = "19w5g5flsjnhjpvnmw7s8b5jg5nlpg0md99zgp3by8gjyigappc7"; + version = "0.8.2.0"; + sha256 = "0xjy5689ck23fyas52qrfrl716fpgmnahp7pln54yyz106hxqj4p"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -23832,8 +23826,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "2.0.1"; - sha256 = "048l78mf3ccb7l0p1zg1wsvqmvpsaqwgik29xm333y7fjlcm0kq6"; + version = "2.0.2"; + sha256 = "0klw0rbxp5g240igrv10808inqmlh3wr3d46zphy5xjxjih07yf3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -47267,17 +47261,17 @@ self: { }) {}; "bytestring-encoding" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, text + ({ mkDerivation, base, bytestring, deepseq, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text }: mkDerivation { pname = "bytestring-encoding"; - version = "0.1.0.0"; - sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d"; + version = "0.1.1.0"; + sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - tasty-th text + base bytestring deepseq QuickCheck tasty tasty-hunit + tasty-quickcheck tasty-th text ]; description = "ByteString ↔ Text converter based on GHC.IO.Encoding"; license = lib.licenses.bsd3; @@ -47738,10 +47732,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "c-enum"; - version = "0.1.0.0"; - sha256 = "02jxhscf8ibzqkhyvsgb04wxl3a02n2qipi3gmdppi6jffk2a1sj"; + version = "0.1.0.1"; + sha256 = "1mg01qzmwaks9ix0269kpvjsa60fkvfc5hjn4wb47c7a6zam2rx0"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; + description = "To make a type corresponding to an enum of C language"; license = lib.licenses.bsd3; }) {}; @@ -51898,8 +51893,8 @@ self: { pname = "cborg-json"; version = "0.2.2.0"; sha256 = "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b"; - revision = "2"; - editedCabalFile = "1hbabjvmyqha75v2ivyvj6yzrnj9vs3h9988j4p68x9bcwmgyjyd"; + revision = "3"; + editedCabalFile = "1sn2f9nfjcbr0n62n4kklbdi3pzpwrcy7ilg7m3v41nwrk53ifwy"; libraryHaskellDepends = [ aeson aeson-pretty base cborg scientific text unordered-containers vector @@ -51977,6 +51972,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {dttools = null;}; + "cdar-mBound" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, integer-gmp + , parallel, QuickCheck, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "cdar-mBound"; + version = "0.1.0.1"; + sha256 = "1a31rjs1if69987xi15qpyl2m21qscsxpyrq4jhfk3j87ilpx5zg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers deepseq integer-gmp ]; + executableHaskellDepends = [ base containers deepseq integer-gmp ]; + testHaskellDepends = [ + base containers deepseq integer-gmp QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq integer-gmp parallel + ]; + description = "Exact real arithmetic using Centred Dyadic Approximations"; + license = lib.licenses.bsd3; + }) {}; + "cdeps" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion , directory, filepath, hspec, optparse-applicative, text @@ -58020,8 +58039,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.0.0"; - sha256 = "1zspgncbnn8zqixlxm3hrck3mk4j3n91515456w8dy220a0bzbhc"; + version = "0.1.1.0"; + sha256 = "0zk7iw1fx50dzm55rcxpd8rwqm7jsb057q8hrf7c8b0jjbrx5b9v"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; @@ -66069,6 +66088,30 @@ self: { pname = "cryptonite"; version = "0.28"; sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; + revision = "1"; + editedCabalFile = "0hqbpdsj1b4fgisr11a9gmin5r7bqr3f83wc2xxc18dr01xhrw7d"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = lib.licenses.bsd3; + }) {}; + + "cryptonite_0_29" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.29"; + sha256 = "13xhp3hshb8x06bw37kp16c9jpjmgfn06nkj9drz745fv8f04fnq"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -66080,6 +66123,7 @@ self: { ]; description = "Cryptography Primitives sink"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -88074,6 +88118,34 @@ self: { broken = true; }) {}; + "faktory_1_0_2_2" = callPackage + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring + , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory + , mtl, network, random, safe-exceptions, scanner, semigroups, text + , time, unix, unordered-containers + }: + mkDerivation { + pname = "faktory"; + version = "1.0.2.2"; + sha256 = "0w1wk40c7drdpm6wzm3hxhbgpznq8275fajb5c3z4pl8cav6hc61"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection cryptonite megaparsec + memory mtl network random safe-exceptions scanner semigroups text + time unix unordered-containers + ]; + executableHaskellDepends = [ aeson base safe-exceptions ]; + testHaskellDepends = [ + aeson async base hspec markdown-unlit time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Faktory Worker for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fallible" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -90107,6 +90179,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "file-embed_0_0_14_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.14.0"; + sha256 = "1b45yk17339zw53zgp8zb5sjg5xn76kryrb6dkqk747vnbdnf0h5"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base bytestring filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -91908,8 +91997,8 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.2.0.0"; - sha256 = "0f7nhspfj90ypylwvya3c3dzvipvc462zyc6191xd1x40wn7qms9"; + version = "0.2.1.0"; + sha256 = "19vwh9fqda7fp7nv7sgxafvvc5kckaayizjw2vvmd634ka0bsyrr"; libraryHaskellDepends = [ base bytestring containers template-haskell ]; @@ -101588,6 +101677,73 @@ self: { license = lib.licenses.asl20; }) {}; + "ghcide_1_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, binary, bytestring, bytestring-encoding + , case-insensitive, containers, cryptohash-sha1, data-default + , deepseq, dependent-map, dependent-sum, Diff, directory, dlist + , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens, lsp + , lsp-test, lsp-types, mtl, network-uri, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "1.3.0.0"; + sha256 = "1rmgrf4is669k5h5hbc9ryp2fc26fcacikzccjyg47jsc967ls9i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-graph hls-plugin-api hslogger implicit-hie-cradle lens lsp + lsp-types mtl network-uri opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa + retrie rope-utf16-splay safe safe-exceptions sorted-list + sqlite-simple stm syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + directory extra filepath ghc gitrev hashable heapsize hie-bios + hiedb hls-graph hls-plugin-api lens lsp lsp-test lsp-types + optparse-applicative process safe-exceptions shake text + unordered-containers + ]; + testHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory extra filepath ghc ghc-typelits-knownnat haddock-library + hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text unordered-containers + ]; + testToolDepends = [ implicit-hie ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -114902,22 +115058,25 @@ self: { "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, hspec, http-client, http-types, mtl, text, time - , unordered-containers + , exceptions, hashable, hedgehog, hspec, hspec-hedgehog + , http-client, http-types, mtl, scientific, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "hal"; - version = "0.4.7"; - sha256 = "1bf2d4djbw8gpkcgrvjm52hsyw8hv20rsk0qdxfi8aml6mp152k5"; + version = "0.4.8"; + sha256 = "1j3prf81ni5v003byl992dxvvkv8prgmsqmnpkwpd0365ilxyv2y"; revision = "1"; - editedCabalFile = "19hic5cgxyk2nz8nnrz091hv79al49q7ah9pv9d7fwagjzi027ch"; + editedCabalFile = "0jz54lz3wd05b2vabwlid31pyhvjrwbdr35nbqb9kdf13jfdgahr"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions http-client http-types mtl - text time unordered-containers + conduit-extra containers envy exceptions hashable http-client + http-types mtl text time unordered-containers ]; testHaskellDepends = [ - aeson base containers hspec http-client http-types time + aeson base base64-bytestring bytestring case-insensitive containers + hedgehog hspec hspec-hedgehog http-client http-types scientific + text time transformers unordered-containers vector ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; @@ -115064,8 +115223,8 @@ self: { }: mkDerivation { pname = "halma"; - version = "0.3.0.1"; - sha256 = "1bmc7s4vl1k2i66q1ir6mkzn67j5gycshkkwp4d2v1dd86sswf28"; + version = "0.3.0.2"; + sha256 = "1fs2095hp8m5k0iq0ilhxc6qmlasdygx9wjdb6288jssdjbvvpyq"; libraryHaskellDepends = [ aeson base containers data-default diagrams-lib grid ]; @@ -117767,10 +117926,8 @@ self: { }: mkDerivation { pname = "haskell-awk"; - version = "1.2"; - sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj"; - revision = "1"; - editedCabalFile = "1d6smaalvf66h0d9d1vq9q8ldxcvg11m05wg70cbsq3s2vh6iz4p"; + version = "1.2.0.1"; + sha256 = "1r4hsvzbqagk06fc81cr1awfz0zqgs4hmbwl99mip47z578wrw9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -117778,15 +117935,15 @@ self: { base bytestring containers ghc list-t stringsearch ]; executableHaskellDepends = [ - base bytestring containers directory exceptions extra filelock - filepath ghc haskell-src-exts hint list-t mtl process stringsearch - template-haskell time transformers + base bytestring containers directory extra filelock filepath ghc + haskell-src-exts hint list-t mtl process template-haskell + transformers ]; testHaskellDepends = [ aeson attoparsec base bytestring containers directory doctest easy-file exceptions extra filelock filepath ghc haskell-src-exts - hint hspec HUnit list-t mtl process stringsearch template-haskell - temporary test-framework test-framework-hunit time transformers + hint hspec HUnit list-t mtl process template-haskell temporary + test-framework test-framework-hunit time transformers ]; description = "Transform text from the command-line using Haskell expressions"; license = lib.licenses.asl20; @@ -120689,8 +120846,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.8"; - sha256 = "14qwdh0fwyqhb3pgykprgp1vs78y4ixn2dn55bsi9x53cjjvp1qp"; + version = "0.52.9"; + sha256 = "12zpjb42j048afaz1ay8ay8j35dhpgiv58cfnm69j8lndcb71q4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120735,8 +120892,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.6"; - sha256 = "0npiib582rnbk3w9f0m71y84xpk7akzkypfxrd9n1s4h3dh0qsfw"; + version = "0.52.9"; + sha256 = "1hh3yxxnwxqvjjcl45k7cpr25imnl9sghzv85i4l1n1vgs10p0nd"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -127220,8 +127377,8 @@ self: { }: mkDerivation { pname = "hierarchical-env"; - version = "0.2.0.0"; - sha256 = "1hslf8wppwbs9r40kfvxwnw6vxwa4fm2fjdfmxn0grpbpwz1qvf5"; + version = "0.2.0.1"; + sha256 = "162d54hxsflhns09d35nz4wyy3im45z8rsra8fjypxdr9z3j38hf"; libraryHaskellDepends = [ base method microlens microlens-mtl microlens-th rio template-haskell th-abstraction @@ -128803,25 +128960,6 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.2.7"; - sha256 = "1p03qigrfkjj0q8ps9gx50pnz6s2rdmn2lqnybhfz8pifsqj0z7k"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base bytestring directory extra filepath simple-cabal - simple-cmd-args typed-process xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3Only; - }) {}; - - "hkgr_0_3" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , simple-cabal, simple-cmd-args, typed-process, xdg-basedir - }: - mkDerivation { - pname = "hkgr"; version = "0.3"; sha256 = "1w8ww2dkskdfs0lh6wbn5byhnrf6mwih7n5yp81fr6awdc0k1qrm"; isLibrary = false; @@ -128833,7 +128971,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "hkt" = callPackage @@ -129662,6 +129799,37 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-explicit-imports-plugin_1_0_0_2" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-graph, hls-plugin-api, lsp, lsp-types, text + , unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.2"; + sha256 = "1ga7phiy7i6kmin0zi0dykbkv29vh46hzrn0bkvfqjkrb41mbi8q"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api + lsp lsp-types text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hls-graph" = callPackage + ({ mkDerivation, base, bytestring, shake, unordered-containers }: + mkDerivation { + pname = "hls-graph"; + version = "1.3.0.0"; + sha256 = "0mz9443jljwgi2zd6gafixfp2k8gpnrn5269qb9bjd5p4ai0bbp7"; + libraryHaskellDepends = [ + base bytestring shake unordered-containers + ]; + description = "Haskell Language Server internal graph API"; + license = lib.licenses.asl20; + }) {}; + "hls-haddock-comments-plugin" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, ghc , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types @@ -129722,6 +129890,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_1_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hls-graph + , hslogger, lens, lsp, opentelemetry, process, regex-tdfa, text + , unix, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "1.1.0.1"; + sha256 = "0xxkpaqnzm39blgaa2f9v35pwnp8rx3jbmgysnsnb9nchnjprg9z"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hls-graph hslogger lens lsp opentelemetry process + regex-tdfa text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie @@ -129731,6 +129919,8 @@ self: { pname = "hls-retrie-plugin"; version = "1.0.0.2"; sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; + revision = "1"; + editedCabalFile = "03r3cb93493hr4rbd8n1ip63myssfycyijg2507kcmsly39i2qkz"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions shake text @@ -136935,6 +137125,23 @@ self: { }) {}; "hspec-golden" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.1.0.3"; + sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = lib.licenses.mit; + }) {}; + + "hspec-golden_0_2_0_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec, hspec-core , optparse-applicative, silently }: @@ -136949,6 +137156,7 @@ self: { testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-golden-aeson" = callPackage @@ -143264,8 +143472,8 @@ self: { ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; - version = "0.2.1.0"; - sha256 = "14vl52v4qshdyp45qrg8ii8xzpi6n05qdgz3ri59wis8hdw1v06z"; + version = "0.2.1.1"; + sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; @@ -143277,8 +143485,8 @@ self: { }: mkDerivation { pname = "hyper-extra"; - version = "0.2.0.0"; - sha256 = "1zcbs9cpr6rfzhsqrv867j79gb3521pyrl32qbp5jwqiy1iyddm5"; + version = "0.2.0.1"; + sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d"; libraryHaskellDepends = [ base diagrams-lib diagrams-svg hyper QuickCheck svg-builder text ]; @@ -147682,17 +147890,19 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time + ({ mkDerivation, base, containers, hspec, QuickCheck, safe, time , witherable }: mkDerivation { pname = "interval-algebra"; - version = "0.6.2"; - sha256 = "0rfx5li74s160i64rjzl1p8gjj3aqxc1hml2n0c1jrair7l1g2iy"; + version = "0.6.3"; + sha256 = "10nrba4q2pyfa028ih079fzyc4l2gp5kfvbmh43lw739mh8kp5aa"; libraryHaskellDepends = [ - base containers QuickCheck time witherable + base containers QuickCheck safe time witherable + ]; + testHaskellDepends = [ + base containers hspec QuickCheck safe time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "An implementation of Allen's interval algebra for temporal logic"; license = lib.licenses.bsd3; }) {}; @@ -148187,6 +148397,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "io-streams_1_5_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory + , filepath, HUnit, mtl, network, primitive, process, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, vector, zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.5.2.1"; + sha256 = "1y3sqmxrwiksz7pl4hf3vzvg8p8n00qnv98nj5xbpcadlh468rny"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring network primitive process text time + transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring deepseq directory filepath HUnit mtl + network primitive process QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers vector zlib zlib-bindings + ]; + description = "Simple, composable, and easy-to-use stream I/O"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "io-streams-haproxy" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams , network, test-framework, test-framework-hunit, transformers @@ -152765,8 +153001,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.2"; - sha256 = "1nhz7rf8sczrhph0h9hia1vqxig1bcpc8v6zvxgrywmacl1mnky6"; + version = "0.5.3"; + sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155202,23 +155438,11 @@ self: { ({ mkDerivation, base, haxr, mtl }: mkDerivation { pname = "koji"; - version = "0.0.1"; - sha256 = "0yxx6xk5xld7jf7ph4x0r7k4bqcg02yl7597awbgbq82x97gyfb8"; - libraryHaskellDepends = [ base haxr mtl ]; - description = "Koji buildsystem XML-RPC API bindings"; - license = lib.licenses.gpl2Only; - }) {}; - - "koji_0_0_2" = callPackage - ({ mkDerivation, base, haxr, mtl }: - mkDerivation { - pname = "koji"; version = "0.0.2"; sha256 = "1ypr552453r0b9s5xlsw0gllka2jaf9xwphlnx55fn05f17zh7qd"; libraryHaskellDepends = [ base haxr mtl ]; description = "Koji buildsystem XML-RPC API bindings"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "kontra-config" = callPackage @@ -171614,6 +171838,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory_0_16_0" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim + }: + mkDerivation { + pname = "memory"; + version = "0.16.0"; + sha256 = "0zzxyr2b7gj92h3jzaq1lfqfyfkfj4l636ry35191i9bp3wa0v8l"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim + ]; + testHaskellDepends = [ base basement bytestring foundation ]; + description = "memory and related abstraction stuff"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -172711,6 +172952,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_10" = callPackage + ({ mkDerivation, base, containers, microlens, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.10"; + sha256 = "1dg2xhj85fy8q39m5dd94kjlabjyxgc0336vzkg0174l6l110l1c"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens tagged ]; + description = "Automatic generation of record lenses for microlens"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -174217,30 +174476,13 @@ self: { }) {}; "mixed-types-num" = callPackage - ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck - , smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.4.1"; - sha256 = "159zx9b5p3g1ywhnbihjbxkpxylgrkhhrswmazymqbh49f4s758y"; - libraryHaskellDepends = [ - base hspec hspec-smallcheck mtl QuickCheck smallcheck - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - }) {}; - - "mixed-types-num_0_5_0_0" = callPackage ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl , QuickCheck, smallcheck, template-haskell }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.0.0"; - sha256 = "17jfrhlcc86qw0zg997hsd11dc97vrqfkylhwb5ii9ls14j5qxfl"; + version = "0.5.0.3"; + sha256 = "0pi91nwnqm2mb2dhyl1l0nq81dlaw9ar538d4n948k2r9lwf56cd"; libraryHaskellDepends = [ base collect-errors hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell @@ -174250,7 +174492,6 @@ self: { ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -174779,6 +175020,22 @@ self: { license = lib.licenses.lgpl3Only; }) {}; + "mnist-idx-conduit" = callPackage + ({ mkDerivation, base, binary, bytestring, conduit, containers + , exceptions, resourcet, vector + }: + mkDerivation { + pname = "mnist-idx-conduit"; + version = "0.2.0.0"; + sha256 = "1m6xxw59yyf60zp0s3qd2pmsps482qws2vlnfqjz2wgr4rj0cp1x"; + libraryHaskellDepends = [ + base binary bytestring conduit containers exceptions resourcet + vector + ]; + description = "conduit utilities for MNIST IDX files"; + license = lib.licenses.bsd3; + }) {}; + "moan" = callPackage ({ mkDerivation, base, binary, bytestring, containers, dawg , regex-tdfa, regex-tdfa-text, tagset-positional, text, zlib @@ -177139,6 +177396,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-extras_0_6" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.6"; + sha256 = "0ki1d3b1xpf653qj7brlqdgngghwrnmapy5gja75iiydfx2506a1"; + libraryHaskellDepends = [ base groups semigroupoids ]; + benchmarkHaskellDepends = [ base criterion semigroups ]; + description = "Various extra monoid-related definitions and utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-owns" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -181317,8 +181588,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.5"; - sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; + version = "0.4.6"; + sha256 = "1am8ck092s9cv4x1ambalil4mlazkp8w5qhjbl4nq0j2hpy73rby"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring containers mysql old-locale pcre-light text time @@ -187741,6 +188012,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "nvfetcher" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, extra, free + , neat-interpolation, shake, text, tomland, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "nvfetcher"; + version = "0.1.0.0"; + sha256 = "1flzivh84fxik5zw3n8j4b65lh8cxd15mjh72y4622rnlnfn2xvv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson base binary bytestring extra free neat-interpolation shake + text tomland transformers unordered-containers validation-selective + ]; + description = "Generate nix sources expr for the latest version of packages"; + license = lib.licenses.mit; + }) {}; + "nvim-hs" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec @@ -195252,8 +195546,8 @@ self: { }: mkDerivation { pname = "passman"; - version = "0.3.0"; - sha256 = "1m3g4ah1wvga3kq9krvg13niisq4rqkb7i6f6lil39v6lplq5drq"; + version = "0.3.0.2"; + sha256 = "0iy5x8v3liclzh3qczkzmql9l6sq5mvplk4xhpnqqhwx3bkik47w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195332,6 +195626,8 @@ self: { pname = "password"; version = "3.0.0.0"; sha256 = "0x6f4zkqqsa6vi5dvy5sj0f7pqkqq9zw3ph9f0d8vl631zcs2inb"; + revision = "1"; + editedCabalFile = "0083j7wnq6dv663i22n0lmrgq8df5pl96xlyad3jv9l27r4z4gdk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -195378,6 +195674,8 @@ self: { pname = "password-types"; version = "1.0.0.0"; sha256 = "090aqq2xs6m5djvr9zfdj7rxafbmj8d05vij5rchj1f9c46dclb5"; + revision = "1"; + editedCabalFile = "1nw1fskhr42xmhdc1bp290333vzgmc3fkfvydfwjvlw0962lxzvy"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring memory text ]; testHaskellDepends = [ @@ -197835,8 +198133,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.2.0"; - sha256 = "0xqzgfzxv8xskyaivar6mnb9qp9s3fq0lh17sajrxa59fi7h8xjw"; + version = "0.2.1"; + sha256 = "0jxhd9bkzcak48nz02g1s8rmbc9fkylf13p4vxkn3x26g2qlig7i"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -199247,8 +199545,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.6.1.0"; - sha256 = "0pa55mkw70f20bw90qc8lballa89zgk6b185038i4p3piipsymrn"; + version = "0.6.2.0"; + sha256 = "1vzx21pp9hkksbw5vpl8rarxpnbhmj04xys3qx0xk0zqf2p1f86q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199402,14 +199700,42 @@ self: { license = lib.licenses.mit; }) {}; + "phonetic-languages-simplified-generalized-examples-array" = callPackage + ({ mkDerivation, base, heaps, mmsyn2-array, 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 + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-array"; + version = "0.1.1.0"; + sha256 = "04b65k6jjrlfx93m7625f991vll136y0lbh82f9qgxlmwv1vwmm8"; + libraryHaskellDepends = [ + base heaps mmsyn2-array 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 + ]; + description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-generalized-examples-common" = callPackage ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics , subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.1.0.1"; - sha256 = "07rqfnz2rkx6rwfgrv97yiww2d1086av60pri5qcp5l44xwlqdy5"; + version = "0.1.1.0"; + sha256 = "0yhpw7bpfag5d6cbm385dy5jxll2vn8104ypqngdv0qlxqx25m9l"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics subG ]; @@ -199424,8 +199750,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.1.0.2"; - sha256 = "1hm9yz0ibfrzmmm70qff0bsghiscigp9843i9nhk41yfxlrmbsp3"; + version = "0.1.1.0"; + sha256 = "04jg2b2qzm3yhbckbpn7zarfdy921lryx8d5r3cx9vcp55xvain0"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -200224,13 +200550,15 @@ self: { }) {}; "pinned-warnings" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, ghc }: + ({ mkDerivation, base, bytestring, containers, directory, ghc, time + , transformers + }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.1"; - sha256 = "0yrd4lqr1sklswalpx7j1bmqjsc19y080wcgq4qd0fmc3qhcixjc"; + version = "0.1.0.2"; + sha256 = "0mm7d185syrbksl751hx0541qdin064ixm7bbqq3ji8jcgbg42x5"; libraryHaskellDepends = [ - base bytestring containers directory ghc + base bytestring containers directory ghc time transformers ]; description = "Preserve warnings in a GHCi session"; license = lib.licenses.bsd3; @@ -200338,29 +200666,6 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.3.15"; - sha256 = "01hvzm7cp6y3wrdhca3wlb99y0az0rjy5lscmnds0v6i767kyxk1"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = lib.licenses.bsd3; - }) {}; - - "pipes_4_3_16" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; version = "4.3.16"; sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; libraryHaskellDepends = [ @@ -200375,7 +200680,6 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -202725,8 +203029,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.7"; - sha256 = "19yvkh4akcsiy0blmrwy7ayirg729s3vs4w0qkb2w171aas34090"; + version = "1.1.1.8"; + sha256 = "0jfl6sp0kv2fdjdhzn85j3hb7a83w9g64girs67v6j53yljqx8vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209973,10 +210277,8 @@ self: { }: mkDerivation { pname = "pseudo-boolean"; - version = "0.1.9.0"; - sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "3"; - editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq"; + version = "0.1.10.0"; + sha256 = "1p9w1d80d2kp7wp7wp6xf9dz1iv9knhy8b75mklz7zq3cf5gvnrh"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -211096,8 +211398,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.1"; - sha256 = "19mdq0piyvqvw2nfcb164narj6d9wgp1as75ri2w21i5qmm1jhi8"; + version = "2.1.0.2"; + sha256 = "0xrmjdika7y2hkp67kzh7xqc3v9j6db1rq2ksih1j9yypa1iihka"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -216125,6 +216427,17 @@ self: { broken = true; }) {}; + "realworldhaskell" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "realworldhaskell"; + version = "0.0.1.0"; + sha256 = "0695y4af42vm50njpldx3i03ia4bws0lx3yhw6p2rv032jhmp5w6"; + libraryHaskellDepends = [ base ]; + description = "The Real World Haskell Book"; + license = lib.licenses.publicDomain; + }) {}; + "reanimate" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour @@ -221999,28 +222312,28 @@ self: { }) {}; "ribosome" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring - , cereal, cereal-conduit, chiasma, composition, composition-extra - , conduit, conduit-extra, containers, cornea, data-default, deepseq - , directory, either, exceptions, filepath, free, hslogger, lens - , lifted-async, lifted-base, messagepack, MissingH, monad-control - , monad-loops, mtl, nvim-hs, path, path-io, pretty-terminal - , prettyprinter, prettyprinter-ansi-terminal, process, relude - , resourcet, safe, split, stm, stm-chans, stm-conduit - , template-haskell, text, th-abstraction, time, transformers - , transformers-base, typed-process, unix, unliftio, unliftio-core - , utf8-string + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cereal + , cereal-conduit, chiasma, composition, composition-extra, conduit + , conduit-extra, containers, cornea, data-default, deepseq + , directory, either, exceptions, filepath, free, fuzzy, hourglass + , hslogger, lens, lifted-async, lifted-base, messagepack + , monad-control, monad-loops, mtl, nvim-hs, path, path-io + , pretty-terminal, prettyprinter, prettyprinter-ansi-terminal + , process, relude, resourcet, safe, split, stm, stm-chans + , stm-conduit, template-haskell, text, th-abstraction, time + , transformers, transformers-base, typed-process, unix, unliftio + , unliftio-core, utf8-string }: mkDerivation { pname = "ribosome"; - version = "0.3.0.1"; - sha256 = "1dka9hqh48nib7y0rz4bxr6d3iqavzw0163q64xwcjxaib293kks"; + version = "0.4.0.0"; + sha256 = "1h8x9gwm5g0jwf8zgpjb0wm76nj54x664l78v58n8cl5kwykr8ig"; libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring cereal cereal-conduit - chiasma composition composition-extra conduit conduit-extra - containers cornea data-default deepseq directory either exceptions - filepath free hslogger lens lifted-async lifted-base messagepack - MissingH monad-control monad-loops mtl nvim-hs path path-io + aeson ansi-terminal base bytestring cereal cereal-conduit chiasma + composition composition-extra conduit conduit-extra containers + cornea data-default deepseq directory either exceptions filepath + free fuzzy hourglass hslogger lens lifted-async lifted-base + messagepack monad-control monad-loops mtl nvim-hs path path-io pretty-terminal prettyprinter prettyprinter-ansi-terminal process relude resourcet safe split stm stm-chans stm-conduit template-haskell text th-abstraction time transformers @@ -222028,7 +222341,7 @@ self: { utf8-string ]; description = "api extensions for nvim-hs"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222066,24 +222379,39 @@ self: { }) {}; "ribosome-test" = callPackage - ({ mkDerivation, base-noprelude, bytestring, chiasma, cornea - , data-default, directory, exceptions, filepath, free, hslogger - , HTF, lifted-base, messagepack, monad-control, mtl, nvim-hs - , process, relude, resourcet, ribosome, text, transformers - , typed-process, unix, unliftio, unliftio-core + ({ mkDerivation, aeson, base, bytestring, chiasma, composition + , composition-extra, conduit, containers, cornea, data-default + , directory, either, exceptions, filepath, free, hedgehog, hslogger + , lens, lifted-async, lifted-base, messagepack, monad-control, mtl + , nvim-hs, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, process, relude, resourcet, ribosome + , tasty, tasty-hedgehog, template-haskell, text, transformers + , typed-process, unix, unliftio }: mkDerivation { pname = "ribosome-test"; - version = "0.3.0.1"; - sha256 = "18pmb6db23ak29y5vqzvblvq3yqpi2zn8qk0cp7825sbahqxn320"; + version = "0.4.0.0"; + sha256 = "1kjs1h4qvgal67xg177dfbc4zcinjsjvjvbkdv3zilxsc6scfq1n"; libraryHaskellDepends = [ - base-noprelude bytestring chiasma cornea data-default directory - exceptions filepath free hslogger HTF lifted-base messagepack - monad-control mtl nvim-hs process relude resourcet ribosome text - transformers typed-process unix unliftio unliftio-core + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio + ]; + testHaskellDepends = [ + aeson base bytestring chiasma composition composition-extra conduit + containers cornea data-default directory either exceptions filepath + free hedgehog hslogger lens lifted-async lifted-base messagepack + monad-control mtl nvim-hs path path-io prettyprinter + prettyprinter-ansi-terminal process relude resourcet ribosome tasty + tasty-hedgehog template-haskell text transformers typed-process + unix unliftio ]; description = "test helpers for ribosome"; - license = "unknown"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -223866,6 +224194,34 @@ self: { broken = true; }) {}; + "rp-tree" = callPackage + ({ mkDerivation, base, boxes, bytestring, conduit, containers + , deepseq, exceptions, hspec, microlens, microlens-th, mtl + , QuickCheck, serialise, splitmix-distributions, transformers + , vector, vector-algorithms + }: + mkDerivation { + pname = "rp-tree"; + version = "0.1.0.0"; + sha256 = "02ws7i6qgixpfr0pw623sz99wr7q605n1hacpdw1il8h8fdzy0r5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base boxes bytestring conduit containers deepseq exceptions hspec + microlens microlens-th mtl serialise splitmix-distributions + transformers vector vector-algorithms + ]; + executableHaskellDepends = [ + base conduit containers exceptions splitmix-distributions + transformers vector + ]; + testHaskellDepends = [ + base hspec QuickCheck splitmix-distributions + ]; + description = "Random projection trees"; + license = lib.licenses.bsd3; + }) {}; + "rpc" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, derive , network-fancy, template-haskell, th-lift @@ -236683,6 +237039,50 @@ self: { license = lib.licenses.bsd3; }) {}; + "simplexmq" = callPackage + ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async + , attoparsec, base, base64-bytestring, bytestring, containers + , cryptonite, cryptostore, directory, filepath, generic-random + , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network + , network-transport, optparse-applicative, QuickCheck, random + , simple-logger, sqlite-simple, stm, template-haskell, text, time + , timeit, transformers, unliftio, unliftio-core, x509 + }: + mkDerivation { + pname = "simplexmq"; + version = "0.3.1"; + sha256 = "0rc443nq4m1ghi5wbsaj6ravqs488lb2si0xmisg9h5ghsh204bf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random iso8601-time memory mtl network + network-transport QuickCheck random simple-logger sqlite-simple stm + template-haskell text time transformers unliftio unliftio-core x509 + ]; + executableHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite cryptostore + directory filepath generic-random ini iso8601-time memory mtl + network network-transport optparse-applicative QuickCheck random + simple-logger sqlite-simple stm template-haskell text time + transformers unliftio unliftio-core x509 + ]; + testHaskellDepends = [ + ansi-terminal asn1-encoding asn1-types async attoparsec base + base64-bytestring bytestring containers cryptonite directory + filepath generic-random hspec hspec-core HUnit iso8601-time memory + mtl network network-transport QuickCheck random simple-logger + sqlite-simple stm template-haskell text time timeit transformers + unliftio unliftio-core x509 + ]; + description = "SimpleXMQ message broker"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "simplistic-generics" = callPackage ({ mkDerivation, base, containers, deepseq, kind-apply, mtl , template-haskell @@ -242517,15 +242917,15 @@ self: { }) {}; "splitmix-distributions" = callPackage - ({ mkDerivation, base, containers, erf, hspec, mtl, splitmix - , transformers + ({ mkDerivation, base, containers, erf, exceptions, hspec, mtl + , splitmix, transformers }: mkDerivation { pname = "splitmix-distributions"; - version = "0.7.0.0"; - sha256 = "1zidzdfyk0rc5hijai99i2k4vh1nlqp42l2m3z92d2qmqkk8nzdl"; + version = "0.8.0.0"; + sha256 = "1l7fh6nycsxy15m2w60pq6zp4iq811wzbklkyrc7z3wlghskqrmk"; libraryHaskellDepends = [ - base containers erf mtl splitmix transformers + base containers erf exceptions mtl splitmix transformers ]; testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; description = "Random samplers for some common distributions, based on splitmix"; @@ -243142,23 +243542,6 @@ self: { }: mkDerivation { pname = "squeather"; - version = "0.6.0.0"; - sha256 = "05cs67xcvfq0497kddmvzrccf7ihav87mv4hmi8kgl2jp8hqmk7p"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base bytestring directory filepath hedgehog lifted-base temporary - text - ]; - description = "Use databases with the version 3 series of the SQLite C library"; - license = lib.licenses.bsd3; - }) {}; - - "squeather_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hedgehog - , lifted-base, temporary, text - }: - mkDerivation { - pname = "squeather"; version = "0.8.0.0"; sha256 = "1pjiq97gq8rjp4v7cx2bhj7zcwkswc593fxdwqajssi1i39679r6"; libraryHaskellDepends = [ base bytestring text ]; @@ -243168,7 +243551,6 @@ self: { ]; description = "Use databases with the version 3 series of the SQLite C library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "squeeze" = callPackage @@ -243597,8 +243979,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.2.1"; - sha256 = "1vkvi9rrf15a8lbihvcmrslykby4qc4jmc5zaqm1ikxsid9x5704"; + version = "2.3.0"; + sha256 = "1gfmr9gcq9zm7ljp2nqmc41lpig11d19xsqzazr2mvm5ddsi69cr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -243644,8 +244026,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.5.1.1"; - sha256 = "0fdm4wc8hxawfab7dv2ayr853mna93gznb7g162gw4h4zxnyzwyc"; + version = "2.7.1"; + sha256 = "09mw5jwgcmbkwsgvg1ls114hq9v2vl49pdvix8ir7vvgicvdhnv0"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -244479,6 +244861,31 @@ self: { broken = true; }) {}; + "stackcollapse-ghc_0_0_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, filepath + , foldl, hspec, hspec-golden, recursion-schemes, rosezipper, safe + , text, transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.4"; + sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra filepath foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -268108,14 +268515,16 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover - , QuickCheck, text + ({ mkDerivation, base, containers, data-default, hspec + , hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.8.0.0"; - sha256 = "1ilbl1f5kigb09n1a8nkm484sjyvi7k3wnga6gj5jgss00xj4xfb"; - libraryHaskellDepends = [ base data-default QuickCheck text ]; + version = "0.9.1.0"; + sha256 = "1jqljawh6xvavp9g8mjlw4pkiagd59yybbizr9vcg70dd8pnanv2"; + libraryHaskellDepends = [ + base containers data-default QuickCheck text + ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; @@ -269251,8 +269660,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.14"; - sha256 = "0gwifnzfcpjhzch06vkx1jkl7jf6j844grd4frl7w513bipb7w0r"; + version = "0.2.15"; + sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -269269,15 +269678,15 @@ self: { license = lib.licenses.mit; }) {}; - "unliftio_0_2_15" = callPackage + "unliftio_0_2_16" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.2.15"; - sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; + version = "0.2.16"; + sha256 = "1zawfyjr8immg5sqvwknwqp3xym0acjhlqm0y6xs63wjvp72wb3r"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -272230,6 +272639,31 @@ self: { broken = true; }) {}; + "vcs-ignore" = callPackage + ({ mkDerivation, base, containers, directory, doctest, exceptions + , filepath, Glob, hspec, hspec-discover, optparse-applicative, text + }: + mkDerivation { + pname = "vcs-ignore"; + version = "0.0.1.0"; + sha256 = "0zz4vwvzxgdqpi30ncp82irdwjyam23z0bdz834xxghfg70q2b5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory exceptions filepath Glob text + ]; + executableHaskellDepends = [ + base containers directory exceptions filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory doctest exceptions filepath hspec text + ]; + testToolDepends = [ hspec-discover ]; + description = "Library for handling files ignored by VCS systems"; + license = lib.licenses.bsd3; + }) {}; + "vcs-revision" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -286006,27 +286440,6 @@ self: { }: mkDerivation { pname = "yesod-persistent"; - version = "1.6.0.6"; - sha256 = "169bwdnaxw926yr5wbcgf7n6v914sgv2vw6ywc95b5xpm0i0dyph"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - description = "Some helpers for using Persistent from Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-persistent_1_6_0_7" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; version = "1.6.0.7"; sha256 = "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4"; libraryHaskellDepends = [ @@ -286039,7 +286452,6 @@ self: { ]; description = "Some helpers for using Persistent from Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-platform" = callPackage diff --git a/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch b/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch deleted file mode 100644 index 39c1f98298b..00000000000 --- a/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs ---- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-04-30 17:45:52.000000000 +0200 -+++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-05-08 18:16:15.054951952 +0200 -@@ -1,11 +1,11 @@ ---- | ---- Module : Data.Phonetic.Languages.SpecificationsRead ---- Copyright : (c) OleksandrZhabenko 2021 ---- License : MIT ---- Stability : Experimental ---- Maintainer : olexandr543@yahoo.com ---- --{-| Provides functions to read data specifications for other modules from textual files. -+{-| -+Module : Data.Phonetic.Languages.SpecificationsRead -+Copyright : (c) OleksandrZhabenko 2021 -+License : MIT -+Stability : Experimental -+Maintainer : olexandr543@yahoo.com -+ -+Provides functions to read data specifications for other modules from textual files. - -} - - module Data.Phonetic.Languages.SpecificationsRead where -diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs ---- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-04-30 17:45:52.000000000 +0200 -+++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-05-08 18:14:06.344145599 +0200 -@@ -1,11 +1,11 @@ ---- | ---- Module : Main ---- Copyright : (c) OleksandrZhabenko 2020-2021 ---- License : MIT ---- Stability : Experimental ---- Maintainer : olexandr543@yahoo.com ---- --{-| Can be used to calculate the durations of the approximations of the phonemes -+{-| -+Module : Main -+Copyright : (c) OleksandrZhabenko 2020-2021 -+License : MIT -+Stability : Experimental -+Maintainer : olexandr543@yahoo.com -+ -+Can be used to calculate the durations of the approximations of the phonemes - using some prepared text with its correct (at least mostly) pronunciation. - The prepared text is located in the same directory and contains lines -the - phonetic language word and its duration in seconds separated with whitespace. diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 532c91a0eda..3e2c0daf0b4 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; dontUseQmakeConfigure = true; - configureFlags = [ "-config" "release" ]; + configureFlags = [ "-config" "release" ] + # Build mixes up dylibs/frameworks if one is not explicitely specified. + ++ lib.optionals stdenv.isDarwin [ "-config" "qt_framework" ]; dontWrapQtApps = true; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 0f6ad84fe75..3833a7fe880 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -10,6 +10,7 @@ , libpng , boost , guile +, stdenv }: mkDerivation { @@ -26,8 +27,19 @@ mkDerivation { nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; buildInputs = [ eigen zlib libpng boost guile ]; - # Link "Studio" binary to "libfive-studio" to be more obvious: - postFixup = '' + postInstall = if stdenv.isDarwin then '' + # No rules to install the mac app, so do it manually. + mkdir -p $out/Applications + cp -r studio/Studio.app $out/Applications/Studio.app + + install_name_tool \ + -change libfive.dylib $out/lib/libfive.dylib \ + -change libfive-guile.dylib $out/lib/libfive-guile.dylib \ + $out/Applications/Studio.app/Contents/MacOS/Studio + + wrapQtApp $out/Applications/Studio.app/Contents/MacOS/Studio + '' else '' + # Link "Studio" binary to "libfive-studio" to be more obvious: ln -s "$out/bin/Studio" "$out/bin/libfive-studio" ''; diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix index 40459dbca22..48edfbfce2c 100644 --- a/pkgs/development/libraries/libnixxml/default.nix +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }: +{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix, bash}: stdenv.mkDerivation { pname = "libnixxml"; @@ -11,17 +11,45 @@ stdenv.mkDerivation { sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; }; - preConfigure = '' - ./bootstrap + prePatch = '' + # Remove broken test + substituteInPlace tests/draw/Makefile.am \ + --replace "draw-wrong.sh" "" + rm tests/draw/draw-wrong.sh + + # Fix bash path + substituteInPlace scripts/nixexpr2xml.in \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + preAutoreconf = '' + # Copied from bootstrap script + ln -s README.md README + mkdir -p config ''; configureFlags = [ "--with-gd" "--with-glib" ]; CFLAGS = "-Wall"; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ]; + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + pkg-config + getopt + libxslt + ]; + buildInputs = [ + bash + libxml2 + gd.dev + glib + nix + ]; + checkInputs = [ + nix + ]; - doCheck = false; + doCheck = true; meta = with lib; { description = "XML-based Nix-friendly data integration library"; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 6607a4d00fb..4015ab02a3a 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.43.0"; + version = "2.45.0"; outputs = [ "out" "dev" ]; @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs="; + sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; }; buildInputs = [ libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional enablePython pythonPackages.python; + ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); patches = lib.optionals enablePython [ ./py_sitepackage_dir.patch + ./py_pybind11_no_external_download.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch new file mode 100644 index 00000000000..2b48edb62e3 --- /dev/null +++ b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -0,0 +1,39 @@ +From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" <rmcgibbo@gmail.com> +Date: Mon, 10 May 2021 17:26:04 -0400 +Subject: [PATCH 1/1] V1 + +--- + wrappers/python/CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt +index aa83e4c77..4ec92ccfa 100644 +--- a/wrappers/python/CMakeLists.txt ++++ b/wrappers/python/CMakeLists.txt +@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) + endif() + + set(DEPENDENCIES realsense2) +-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), +-# we copy the external project declaration to the build folder and then execute it +-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) +-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) +-execute_process(COMMAND "${CMAKE_COMMAND}" --build . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) + +-# Add pybind11 makefile +-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" +- "${CMAKE_BINARY_DIR}/third-party/pybind11" +- EXCLUDE_FROM_ALL +-) ++find_package(pybind11 REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++11) + # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. +-- +2.29.3 + diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 161833a928c..b476edaf5e6 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.0"; + version = "0.3.1"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-prHsigfjifwiuBSUHaCWhjJIaw1LkOGHJu20cdPgH9c="; + sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; }; patches = [ diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index d4f11c1d126..45d5e0a40eb 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -23,18 +23,42 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff - libwebp libxml2 proj python sqlite zlib + libwebp proj python sqlite zlib # optional inputs postgresql ]; + propagatedBuildInputs = [ libxml2 ]; + prefixKey = "PREFIX="; preConfigure = '' patchShebangs ./configure ''; + # NOTE: 2021-05-06: + # Add -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 for backwards compatibility + # with major versions 6 and 7 of proj which are otherwise not compatible + # with mapnik 3.1.0. Note that: + # + # 1. Starting with proj version 8, this workaround will no longer be + # supported by the upstream proj project. + # + # 2. Without the workaround, mapnik configures itself without proj support. + # + # 3. The master branch of mapnik (after 3.1.0) appears to add native support + # for the proj 6 api, so this workaround is not likely to be needed in + # subsequent mapnik releases. At that point, this block comment and the + # NIX_CFLAGS_COMPILE expression can be removed. + + NIX_CFLAGS_COMPILE = + if version != "3.1.0" && lib.versionAtLeast version "3.1.0" + then throw "The mapnik compatibility workaround for proj 6 may no longer be required. Remove workaround after checking." + else if lib.versionAtLeast (lib.getVersion proj) "8" + then throw ("mapnik currently requires a version of proj less than 8, but proj version is: " + (lib.getVersion proj)) + else "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; + configureFlags = [ "BOOST_INCLUDES=${boost.dev}/include" "BOOST_LIBS=${boost.out}/lib" @@ -51,16 +75,19 @@ stdenv.mkDerivation rec { "JPEG_LIBS=${libjpeg.out}/lib" "PNG_INCLUDES=${libpng.dev}/include" "PNG_LIBS=${libpng.out}/lib" - "PROJ_INCLUDES=${proj}/include" - "PROJ_LIBS=${proj}/lib" + "PROJ_INCLUDES=${proj.dev}/include" + "PROJ_LIBS=${proj.out}/lib" "SQLITE_INCLUDES=${sqlite.dev}/include" "SQLITE_LIBS=${sqlite.out}/lib" "TIFF_INCLUDES=${libtiff.dev}/include" "TIFF_LIBS=${libtiff.out}/lib" "WEBP_INCLUDES=${libwebp}/include" "WEBP_LIBS=${libwebp}/lib" - "XML2_INCLUDES=${libxml2.dev}/include" - "XML2_LIBS=${libxml2.out}/lib" + "XMLPARSER=libxml2" + ]; + + buildFlags = [ + "JOBS=$(NIX_BUILD_CORES)" ]; meta = with lib; { diff --git a/pkgs/development/libraries/md4c/default.nix b/pkgs/development/libraries/md4c/default.nix index a711ecb7c76..a29b521a2de 100644 --- a/pkgs/development/libraries/md4c/default.nix +++ b/pkgs/development/libraries/md4c/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "md4c"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "mity"; repo = pname; rev = "release-${version}"; - hash = "sha256-nfMXUP1wu3ifn1QVTO/+XcfFRsThG8PlmYRv+b8AYlQ="; + hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 97ce24a8398..7aef5ba7476 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,22 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, fixDarwinDylibNames +}: -with lib; stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "tbb"; - version = "2020_U3"; + version = "2020.3"; src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = version; - sha256 = "sha256-prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; + owner = "oneapi-src"; + repo = "oneTBB"; + rev = "v${version}"; + sha256 = "prO2O5hd+Wz5iA0vfrqmyHFr0Ptzk64so5KpSpvuKmU="; }; - nativeBuildInputs = optional stdenv.isDarwin fixDarwinDylibNames; + patches = [ + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch"; + sha256 = "gUfXQ9OZQ82qD6brgauBCsKdjLvyHafMc18B+KxZoYs="; + }) - makeFlags = optional (compiler != null) "compiler=${compiler}" - ++ optional (stdver != null) "stdver=${stdver}"; + # Fixes build with Musl. + (fetchurl { + url = "https://github.com/openembedded/meta-openembedded/raw/39185eb1d1615e919e3ae14ae63b8ed7d3e5d83f/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch"; + sha256 = "fhorfqO1hHKZ61uq+yTR7eQ8KYdyLwpM3K7WpwJpV74="; + }) + ]; - patches = lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + + makeFlags = lib.optionals stdenv.cc.isClang [ + "compiler=clang" + ]; + + enableParallelBuilding = true; installPhase = '' runHook preInstall @@ -29,9 +51,24 @@ with lib; stdenv.mkDerivation rec { runHook postInstall ''; - enableParallelBuilding = true; + postInstall = let + pcTemplate = fetchurl { + url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in"; + sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; + }; + in '' + # Generate pkg-config file based on upstream template. + # It should not be necessary with tbb after 2021.2. + mkdir -p "$out/lib/pkgconfig" + substitute "${pcTemplate}" "$out/lib/pkgconfig/tbb.pc" \ + --subst-var-by CMAKE_INSTALL_PREFIX "$out" \ + --subst-var-by CMAKE_INSTALL_LIBDIR "lib" \ + --subst-var-by CMAKE_INSTALL_INCLUDEDIR "include" \ + --subst-var-by TBB_VERSION "${version}" \ + --subst-var-by TBB_LIB_NAME "tbb" + ''; - meta = { + meta = with lib; { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; license = licenses.asl20; @@ -43,7 +80,7 @@ with lib; stdenv.mkDerivation rec { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with platforms; linux ++ darwin; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice dizfer ]; }; } diff --git a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch b/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch deleted file mode 100644 index 64056ecb146..00000000000 --- a/pkgs/development/libraries/tbb/glibc-struct-mallinfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b577153a10c98f4e13405dc93ea2ab1a7b990e07 Mon Sep 17 00:00:00 2001 -From: David Huffman <storedbox+alpine@outlook.com> -Date: Wed, 6 Jan 2016 07:09:30 -0500 -Subject: [PATCH] hard-code glibc's definition of struct mallinfo - ---- - src/tbbmalloc/proxy.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/tbbmalloc/proxy.h b/src/tbbmalloc/proxy.h -index 781cadc..e1ea1ae 100644 ---- a/src/tbbmalloc/proxy.h -+++ b/src/tbbmalloc/proxy.h -@@ -32,6 +32,26 @@ - - #include <stddef.h> - -+// The following definition was taken from /usr/include/malloc.h as provided by -+// the glibc-devel-2.19-17.4.x86_64 package on openSUSE Leap 42.1; it is -+// made available under the GNU Lesser General Public License v2.1 or later. -+// See <https://www.gnu.org/licenses>. -+// -+// Copyright (C) 1996-2014 Free Software Foundation, Inc. -+struct mallinfo -+{ -+ int arena; /* non-mmapped space allocated from system */ -+ int ordblks; /* number of free chunks */ -+ int smblks; /* number of fastbin blocks */ -+ int hblks; /* number of mmapped regions */ -+ int hblkhd; /* space in mmapped regions */ -+ int usmblks; /* maximum total allocated space */ -+ int fsmblks; /* space available in freed fastbin blocks */ -+ int uordblks; /* total allocated space */ -+ int fordblks; /* total free space */ -+ int keepcost; /* top-most, releasable (via malloc_trim) space */ -+}; -+ - extern "C" { - void * scalable_malloc(size_t size); - void * scalable_calloc(size_t nobj, size_t size); --- -2.6.2 - diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index f4b716ee6d4..f37ba500a22 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -53,13 +53,14 @@ , xdg-dbus-proxy , substituteAll , glib +, addOpenGLRunpath }: assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.0"; + version = "2.32.1"; outputs = [ "out" "dev" ]; @@ -67,13 +68,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; + sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k"; }; patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; + inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch ]; diff --git a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch index 03a6b6903a8..d502958f4f1 100644 --- a/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch +++ b/pkgs/development/libraries/webkitgtk/fix-bubblewrap-paths.patch @@ -1,16 +1,7 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp --- old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-09 04:47:07.000000000 -0400 +++ webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2019-09-20 21:14:10.537921173 -0400 -@@ -585,7 +585,7 @@ - { SCMP_SYS(keyctl), nullptr }, - { SCMP_SYS(request_key), nullptr }, - -- // Scary VM/NUMA ops -+ // Scary VM/NUMA ops - { SCMP_SYS(move_pages), nullptr }, - { SCMP_SYS(mbind), nullptr }, - { SCMP_SYS(get_mempolicy), nullptr }, -@@ -724,6 +724,11 @@ +@@ -724,6 +724,12 @@ "--ro-bind-try", "/usr/local/lib64", "/usr/local/lib64", "--ro-bind-try", PKGLIBEXECDIR, PKGLIBEXECDIR, @@ -18,7 +9,8 @@ diff -ru old/webkitgtk-2.26.0/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLa + // Nix Directories + "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", "/run/current-system", "/run/current-system", -+ "--ro-bind", "/run/opengl-driver", "/run/opengl-driver", ++ "--ro-bind-try", "@driverLink@/lib", "@driverLink@/lib", ++ "--ro-bind-try", "@driverLink@/share", "@driverLink@/share", }; // We would have to parse ld config files for more info. bindPathVar(sandboxArgs, "LD_LIBRARY_PATH"); diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ff9b4747e68..3654d7b5296 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -60,8 +60,9 @@ let }; }); - bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { + bitwarden-cli = super."@bitwarden/cli".override (drv: { name = "bitwarden-cli-${drv.version}"; + meta.mainProgram = "bw"; }); fast-cli = super."fast-cli-1.x".override { diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix index 132a25a2df4..a9c34a8d778 100644 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -15,4 +15,5 @@ buildPecl { ''; meta.maintainers = lib.teams.php.members; + meta.broken = lib.versionAtLeast php.version "8"; } diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index edd2796eca4..a6bd79e80ef 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -9,18 +9,16 @@ buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "kennedyshead"; repo = pname; - rev = "V${version}"; - sha256 = "1h1qwc7szgrcwiz4q6x4mlf26is20lj1ds5rcb9i611j26656v6d"; + rev = version; + sha256 = "101d76zarvilzfmcy8n3bjqzyars8hsjzr0zc80d4rngv4vhrki1"; }; postPatch = '' - substituteInPlace setup.py \ - --replace "cryptography==3.3.2" "cryptography" substituteInPlace setup.cfg \ --replace "--cov-report html" "" \ --replace "--cov-report term-missing" "" diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 7525e4dcca6..686163f3574 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.6.6"; + version = "2.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-LdBUtU5rNoixh7DPIFkHxLMvBeI6MZH57sO0IjuOQAw="; + sha256 = "sha256-PCoSJnt8EptVq5u0+NgEBwY6zLkD87XqVRBDdqBziM8="; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 7b7bce8ac42..65baaec3719 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk"; + sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; }; propagatedBuildInputs = [ @@ -22,12 +22,13 @@ buildPythonPackage rec { "aiohue.discovery" ]; - # has no tests + # Project has no tests doCheck = false; meta = with lib; { - description = "asyncio package to talk to Philips Hue"; - homepage = "https://github.com/balloob/aiohue"; - license = licenses.asl20; + description = "Python package to talk to Philips Hue"; + homepage = "https://github.com/home-assistant-libs/aiohue"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 25925f56069..0429ee7a507 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -1,89 +1,60 @@ -{ buildPythonPackage -, fetchFromGitHub -, isPy3k -, glibcLocales -, lib -, pythonOlder - +{ lib , aiohttp -, aiohttp-swagger , aiohttp-jinja2 +, aiohttp-remotes +, aiohttp-swagger +, buildPythonPackage , clickclick , decorator -, flake8 +, fetchFromGitHub , flask -, gevent , inflection , jsonschema -, mock , openapi-spec-validator -, pathlib -, pytest , pytest-aiohttp -, pytestcov +, pytestCheckHook +, pythonOlder , pyyaml , requests -, six , swagger-ui-bundle , testfixtures -, typing ? null -, ujson }: buildPythonPackage rec { pname = "connexion"; - version = "2.4.0"; + version = "2.7.0"; + disabled = pythonOlder "3.6"; - # we're fetching from GitHub because tests weren't distributed on PyPi src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg"; + sha256 = "15iflq5403diwda6n6qrpq67wkdcvl3vs0gsg0fapxqnq3a2m7jj"; }; - checkInputs = [ - decorator - mock - pytest - pytestcov - testfixtures - flask - swagger-ui-bundle - ] - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson pytest-aiohttp ] - ++ lib.optional (pythonOlder "3.7") glibcLocales - ; propagatedBuildInputs = [ + aiohttp + aiohttp-jinja2 + aiohttp-swagger clickclick + flask + inflection jsonschema + openapi-spec-validator pyyaml requests - six - inflection - openapi-spec-validator swagger-ui-bundle - flask - ] - ++ lib.optional (pythonOlder "3.4") pathlib - ++ lib.optional (pythonOlder "3.6") typing - ++ lib.optionals isPy3k [ aiohttp aiohttp-jinja2 aiohttp-swagger ujson ] - ; - - preConfigure = lib.optional (pythonOlder "3.7") '' - export LANG=en_US.UTF-8 - ''; + ]; - postPatch = '' - substituteInPlace setup.py --replace "'aiohttp>=2.3.10,<3.5.2'" "'aiohttp>=2.3.10'" - ''; + checkInputs = [ + aiohttp-remotes + decorator + pytest-aiohttp + pytestCheckHook + testfixtures + ]; - checkPhase = if isPy3k then '' - pytest -k "not test_app_get_root_path and \ - not test_verify_oauth_scopes_remote and \ - not test_verify_oauth_scopes_local and \ - not test_run_with_aiohttp_not_installed"'' - else "pytest --ignore=tests/aiohttp"; + pythonImportsCheck = [ "connexion" ]; meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 57a1b9b582d..e4e36a196fe 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.7"; + version = "0.10.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; repo = pname; rev = version; - sha256 = "sha256-IGfU9nnlfZf8U6pCzG7cegmqxmDNONom0U14PZHHaYY="; + sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix deleted file mode 100644 index 92aefe4a408..00000000000 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, django, futures ? null, mock ? null, jinja2, jsmin, slimit }: - -buildPythonPackage rec { - pname = "django-pipeline"; - version = "1.6.14"; - - # no tests on PyPI - src = fetchFromGitHub { - owner = "jazzband"; - repo = pname; - rev = version; - sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j"; - }; - - postPatch = '' - substituteInPlace tests/tests/test_compiler.py \ - --replace "/usr/bin/env" "" - ''; - - propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures; - - checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock; - - checkPhase = '' - export PYTHONPATH=.:$PYTHONPATH - export DJANGO_SETTINGS_MODULE=tests.settings - ${django}/bin/django-admin.py test tests - ''; - - meta = with lib; { - description = "Pipeline is an asset packaging library for Django"; - homepage = "https://github.com/cyberdelia/django-pipeline"; - license = licenses.mit; - broken = true; - }; -} diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 011909d6b80..ed87f3678b1 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -1,6 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, tatsu, arrow -, pytestCheckHook, pytest-flakes +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tatsu +, arrow +, pytestCheckHook +, pytest-flakes }: buildPythonPackage rec { @@ -9,21 +14,35 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "C4ptainCrunch"; - repo = "ics.py"; + owner = "ics-py"; + repo = "ics-py"; rev = "v${version}"; sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn"; }; - propagatedBuildInputs = [ tatsu arrow ]; + propagatedBuildInputs = [ + arrow + tatsu + ]; + + checkInputs = [ + pytest-flakes + pytestCheckHook + ]; postPatch = '' + # 0.8 will move to python-dateutil substituteInPlace requirements.txt \ --replace "arrow>=0.11,<0.15" "arrow" substituteInPlace setup.cfg --replace "--pep8" "" ''; - checkInputs = [ pytestCheckHook pytest-flakes ]; + disabledTests = [ + # Failure seems to be related to arrow > 1.0 + "test_event" + ]; + + pythonImportsCheck = [ "ics" ]; meta = with lib; { description = "Pythonic and easy iCalendar library (RFC 5545)"; @@ -32,9 +51,8 @@ buildPythonPackage rec { write ics data in a developer friendly way. ''; homepage = "http://icspy.readthedocs.org/en/stable/"; - changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}"; + changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ primeos ]; }; - } diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 700c23827fa..75de29b233d 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.40.0"; + version = "0.41.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A="; + sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index eb8605c45dd..204e3e93b8d 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.0"; + version = "0.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9"; + sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index d349a58960a..50b9eb57630 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -4,6 +4,8 @@ , glibcLocales , setuptools_scm , wcwidth +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -18,7 +20,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; buildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ wcwidth ]; + propagatedBuildInputs = [ + wcwidth + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; preCheck = '' export LANG="en_US.UTF-8" diff --git a/pkgs/development/python-modules/py-dmidecode/default.nix b/pkgs/development/python-modules/py-dmidecode/default.nix new file mode 100644 index 00000000000..e74a8d7ac29 --- /dev/null +++ b/pkgs/development/python-modules/py-dmidecode/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, dmidecode }: + +buildPythonPackage rec { + pname = "py-dmidecode"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa"; + }; + + propagatedBuildInputs = [ dmidecode ]; + + # Project has no tests. + doCheck = false; + pythonImportsCheck = [ "dmidecode" ]; + + meta = with lib; { + homepage = "https://github.com/zaibon/py-dmidecode/"; + description = "Python library that parses the output of dmidecode"; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 36c297358e8..b1b0c70d860 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -35,10 +35,16 @@ in buildPythonPackage rec { export BOOST_PYTHON_LIB="boost_python${pythonVersion}" export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" + export PYCAIRO=true ''; nativeBuildInputs = [ mapnik # for mapnik_config + pkgs.pkgconfig + ]; + + patches = [ + ./find-pycairo-with-pkg-config.patch ]; buildInputs = [ diff --git a/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch b/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch new file mode 100644 index 00000000000..1f35af36ee8 --- /dev/null +++ b/pkgs/development/python-modules/python-mapnik/find-pycairo-with-pkg-config.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index 82a31d733..1c876a553 100755 +--- a/setup.py ++++ b/setup.py +@@ -228,10 +228,9 @@ extra_comp_args = list(filter(lambda arg: arg != "-fvisibility=hidden", extra_co + if os.environ.get("PYCAIRO", "false") == "true": + try: + extra_comp_args.append('-DHAVE_PYCAIRO') +- print("-I%s/include/pycairo".format(sys.exec_prefix)) +- extra_comp_args.append("-I{0}/include/pycairo".format(sys.exec_prefix)) +- #extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' ')) +- #linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' ')) ++ pycairo_name = 'py3cairo' if PYTHON3 else 'pycairo' ++ extra_comp_args.extend(check_output(["pkg-config", '--cflags', pycairo_name]).strip().split(' ')) ++ linkflags.extend(check_output(["pkg-config", '--libs', pycairo_name]).strip().split(' ')) + except: + raise Exception("Failed to find compiler options for pycairo") + diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index 1880a0e2bf9..41af9502c0c 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.8.0"; + version = "1.8.1"; in buildPythonPackage { inherit version; @@ -64,6 +64,7 @@ in buildPythonPackage { meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; license = licenses.unfree; # Includes CUDA and Intel MKL. platforms = platforms.linux; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index bc838597038..4855d135710 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,14 +1,17 @@ version: { x86_64-linux-37 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-bs29RJS0vy0xok3fvf8yvZlTibyGYqRUvUDT6M4gKQc="; + name = "torch-${version}-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-lxj066PiB+S88GqQnXKgd9RCiKkMk3mctx/eBieZjAk="; }; x86_64-linux-38 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-+h45HMo5N9Xeox8xoagKAb1KgGLAOUSMJUu/WljrB4c="; + name = "torch-${version}-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-qvTQMLz4CQPgalzUyYwz6rm+ExyWlIzI+FSMQhxM4eM="; }; x86_64-linux-39 = { - url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-Ixj6yGCuc9xkhsDeIiNnTZ72E5/HXxV68r+Nzk/KVSQ="; + name = "torch-${version}-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-z0pzEiljU+E2x2SuOEAg86dmVY1iFZSDOCfoOAFhLQo="; }; } diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 225a8f149e4..f4b2efbc2ba 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , requests +, cryptography , python }: @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests cryptography ]; checkPhase = '' ${python.interpreter} test/test.py diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index bf780985bc4..9c3e99e23ad 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -35,6 +35,9 @@ let newPython = python3.override { inherit version; sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; }; + disabledTests = [ + "test_ec_verify_should_return_false_if_signature_invalid" + ]; }); }; }; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix new file mode 100644 index 00000000000..58ca9107c54 --- /dev/null +++ b/pkgs/development/tools/earthly/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "earthly"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly"; + rev = "v${version}"; + sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv"; + }; + + vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k"; + + postInstall = '' + mv $out/bin/debugger $out/bin/earthly-debugger + mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater + ''; + + meta = with lib; { + description = "Build automation for the container era"; + homepage = "https://earthly.dev/"; + changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ mdsp ]; + }; +} diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 9a0fa54fb2d..355f468237c 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m8VgjfNDxSX6fRG2/gEJlVc9hCnua+o79ttrd8P20kU="; + sha256 = "sha256-O3gfQon8ktObLVED4A5sCSOw8K1NIXP3a5AsLq3Svb4="; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 0fd45598a83..659532e04e0 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gojsontoyaml"; - version = "unstable-2020-06-02"; + version = "unstable-2020-12-16"; src = fetchFromGitHub { owner = "brancz"; repo = "gojsontoyaml"; - rev = "3697ded27e8cfea8e547eb082ebfbde36f1b5ee6"; - sha256 = "07sisadpfnzbylzirs5ski8wl9fl18dm7xhbv8imw6ksxq4v467a"; + rev = "202f76bf8c1f8fb74941a845b349941064603185"; + sha256 = "sha256-N49iHQh28nAZBGJnLKG/aZPdn5fwPKQpdrXXtX28yss="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index cafa63e96bd..0c52a89229d 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo="; + sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; }; - vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg="; + vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index 9c56efcb59f..ba4a681a594 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -14,9 +14,6 @@ in stdenv.mkDerivation rec { preConfigure = '' export SYBASE=${freetds} - - substituteInPlace src/cmd_connect.c \ - --replace CS_TDS_80 CS_TDS_73 '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "libct.so" "libct.dylib" ''; @@ -27,6 +24,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + patches = [ + (fetchurl { + # https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/databases/sqsh/patches/patch-src_cmd_connect_c + name = "patch-src_cmd_connect_c.patch"; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/databases/sqsh/patches/patch-src_cmd_connect_c?rev=1.2&content-type=text/plain"; + sha256 = "1dz97knr2h0a0ca1vq2mx6h8s3ns9jb1a0qraa4wkfmcdi3aqw0j"; + }) + ]; + + patchFlags = [ "-p0" ]; + meta = with lib; { description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9b645fb55e3..d1632ebcf5d 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,19 +16,21 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI="; + sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0="; }; - cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI="; + cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; + buildAndTestSubdir = "cli"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem @@ -51,9 +53,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - # remove test plugin and test server - rm -r $out/lib $out/bin/test_server $out/bin/denort - installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index c1dbd0f773a..8ae163f2c90 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.1"; + version = "0.22.2"; shas = { - x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; - aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; - x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; - aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; + x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; + aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; + x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; + aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; }; } diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix index 69a371f09d9..fa654832e2e 100644 --- a/pkgs/games/0verkill/default.nix +++ b/pkgs/games/0verkill/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, gccStdenv , fetchFromGitHub , autoreconfHook , xorgproto @@ -7,7 +7,7 @@ , libXpm }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "0verkill"; version = "unstable-2011-01-13"; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index de25fa691d5..dea5190d976 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,39 +1,81 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper -, boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff -, libjpeg, libGLU, libGL, glew, libxslt +{ lib +, stdenv +, fetchFromGitHub +, cmake +, doxygen +, graphviz +, makeWrapper +, cppcheck +, boost16x +, SDL2 +, python3 +, freetype +, openal +, libogg +, libvorbis +, zlib +, libpng +, libtiff +, libjpeg +, libGLU +, libGL +, glew +, libxslt }: stdenv.mkDerivation rec { - version = "0.4.9"; + version = "0.4.10.1"; pname = "freeorion"; src = fetchFromGitHub { - owner = "freeorion"; - repo = "freeorion"; + owner = "freeorion"; + repo = "freeorion"; rev = "v${version}"; - sha256 = "18xigx4qla225ybf7mc1w8zfm81nhcm1i5181n5l2fbndvslb1wf"; + sha256 = "sha256-Itt2JIStx+JsnMMBvbeJXSEJpaS/pd1UMvPGNd50k7I="; }; buildInputs = [ - (boost168.override { enablePython = true; }) - SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ]; + (boost16x.override { enablePython = true; python = python3; }) + (python3.withPackages (p: with p; [ pycodestyle ])) + SDL2 + freetype + glew + libGL + libGLU + libjpeg + libogg + libpng + libtiff + libvorbis + openal + zlib + ]; - nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; + nativeBuildInputs = [ + cmake + cppcheck + doxygen + graphviz + makeWrapper + ]; + + # as of 0.4.10.1 FreeOrion doesn't work with "-DOpenGL_GL_PREFERENCE=GLVND" + cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=LEGACY" ]; postInstall = '' - mkdir -p $out/fixpaths + mkdir -p $out/libexec # We need final slashes for XSLT replace to work properly - substitute ${./fix-paths.xslt} $out/fixpaths/fix-paths.xslt \ + substitute ${./fix-paths.xslt} $out/share/freeorion/fix-paths.xslt \ --subst-var-by nixStore "$NIX_STORE/" \ --subst-var-by out "$out/" - substitute ${./fix-paths.sh} $out/fixpaths/fix-paths \ + substitute ${./fix-paths.sh} $out/libexec/fix-paths \ --subst-var-by libxsltBin ${libxslt.bin} \ --subst-var-by shell ${stdenv.shell} \ --subst-var out - chmod +x $out/fixpaths/fix-paths + chmod +x $out/libexec/fix-paths wrapProgram $out/bin/freeorion \ - --run $out/fixpaths/fix-paths \ + --run $out/libexec/fix-paths \ --prefix LD_LIBRARY_PATH : $out/lib/freeorion ''; diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/games/freeorion/fix-paths.sh index 3f82533dd60..def017ddc5b 100644 --- a/pkgs/games/freeorion/fix-paths.sh +++ b/pkgs/games/freeorion/fix-paths.sh @@ -1,6 +1,6 @@ #!@shell@ if [ -e ~/.config/freeorion/config.xml ]; then - @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/fixpaths/fix-paths.xslt ~/.config/freeorion/config.xml + @libxsltBin@/bin/xsltproc -o ~/.config/freeorion/config.xml @out@/share/freeorion/fix-paths.xslt ~/.config/freeorion/config.xml fi exit 0 diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix new file mode 100644 index 00000000000..968f529421d --- /dev/null +++ b/pkgs/games/steam-tui/default.nix @@ -0,0 +1,45 @@ +{ lib +, rustPlatform +, steamcmd +, fetchFromGitHub +, steam-run-native +, runtimeShell +, withWine ? false +, wine +}: + +rustPlatform.buildRustPackage rec { + pname = "steam-tui"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dmadisetti"; + repo = pname; + rev = version; + sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + }; + + cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + + buildInputs = [ steamcmd steam-run-native ] + ++ lib.optional withWine wine; + + preFixup = '' + mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped + cat > $out/bin/steam-tui <<EOF + #!${runtimeShell} + export PATH=${steamcmd}/bin:\$PATH + exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@' + EOF + chmod +x $out/bin/steam-tui + ''; + + meta = with lib; { + description = "Rust TUI client for steamcmd"; + homepage = "https://github.com/dmadisetti/steam-tui"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + # steam only supports that platform + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index c86198a6985..3b4c34702d3 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.7.0"; - enableParallelBuilding = true; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + version = "1.8.0"; src = fetchurl { url = "http://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "0ljmac0lnjn61admgbcwjfcr5fwccrsblx9rj9bys8wlhz8f796x"; + sha256 = "027hlqji0h2cm96rb8qvkdmwxl56l59bgn828nvmwak2c2i5k703"; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib; + + enableParallelBuilding = true; + meta = with lib; { homepage = "http://www.sndio.org"; description = "Small audio and MIDI framework part of the OpenBSD project"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 459f768a379..e2ec999e3ce 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -269,12 +269,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-05-10"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "1e7347964ceab49c5ed7e1224de328cdd8b90919"; - sha256 = "00p1h7nznrhjfddxzxamyjkf9cgdjw9f8zhzs366k8gfva5fh4r3"; + rev = "78ab34de8c77e2e230502945bd4d156af5d54ab8"; + sha256 = "0smbf73i0ingvagxyjk6lb6g2axr6mgqk74c8w27504bnvay7y0w"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -401,12 +401,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-11"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2ccce5fa035176b51fa628ba6c672dedf78813e8"; - sha256 = "0nrxxwf4wy6g5222qf4bjbyai8gym1k0b4wdyjpldfk5pdxd81zg"; + rev = "4e5d98ff3a243167cafbc48de104a279b42318ac"; + sha256 = "006rgvhvnd30qygqdqrlqxbc3yv9qk2ndmr7rkd5fln95g7ib8b5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -718,8 +718,8 @@ let src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "39a552866c83946127f244912b6d408525f03364"; - sha256 = "0m2w4f3bn8miplxb9q76fcipdkc9lbfyp47193q57s555b1g0x0k"; + rev = "62c74b280d5cb0c16ed7a84e5b4eff4336d30d40"; + sha256 = "1bwwcf6lnx0drjn7192fnplnq1xw85yf2g2fh7mnab7i5w2lmbw3"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -738,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-05-07"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "b24f6df45012c2c53743777b306fdb9396dcb5e9"; - sha256 = "08xqgkivczp3yciqc3xigdfl1q4c14mfa0i27didwds73i94mqqd"; + rev = "2cababf4c1b6cc2e460bbbd63e69ed5d9fc2ee34"; + sha256 = "086gqc76ki8jwhhk4ihawjciwjsrq9k13bgwlnjhsp2rhm0vslb7"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1280,12 +1280,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-04-16"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "63d3c193ccb1652a972ca0def7ab82048bfb6068"; - sha256 = "0v0fd6n6fza1rj008zpjicvh9d8mcvz3kza8hhby9nx9cjlj2dpc"; + rev = "7dc1d45d7ffd275c06bf207795cf071ae6c9f1a4"; + sha256 = "1hxywy423ikfkmcyqm467j741mn0ar4c5k7li0liniygjwpiaxjm"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1811,12 +1811,12 @@ let gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-05-10"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "c26c456a6b36cac79e01f6cf7eebb8cc9231ab16"; - sha256 = "0kpgkdwkz27xl56yicf8b8zhqg84657s14xl0blh802cm275hz92"; + rev = "86bc293204a6c13f1650378c39bf248bd5a5a22f"; + sha256 = "0if2ad8s9r3pwdsqlkl6y82r0a0z86c6vlkdp28m18sxv848psx5"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2268,12 +2268,12 @@ let LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-05-07"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "e65a9b9b88df503340643d3c086ec1ee53898891"; - sha256 = "0x1hzbzjw28cisj8xzglp9qhbzzkxv3lg98imxrpswn6xynpdz4n"; + rev = "1078dcaff8bab986245b79b26891ef592aeb0cbe"; + sha256 = "032czx26x3118j2bqgcqa4c10nknidg4dzpsk43biw66z7l6x5jf"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2448,12 +2448,12 @@ let lsp-trouble-nvim = buildVimPluginFrom2Nix { pname = "lsp-trouble-nvim"; - version = "2021-05-10"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-trouble.nvim"; - rev = "1dd72c22403519c160b0c694762091971bcf191e"; - sha256 = "1831ywvbl51zd8m5rkpq59dw6s55snsyv94n28vl316cm65q28ji"; + rev = "0f584688c3dcd6a2cacf2e750da7fe3b5e7f260e"; + sha256 = "14wfnv98ys0mc9xpfl0d06iv63k4bfhjy8h35sngb0mikb1wb0ns"; }; meta.homepage = "https://github.com/folke/lsp-trouble.nvim/"; }; @@ -2496,12 +2496,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-05-10"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "11280b44f2f3812b60e99b7e07e4d37bee418cb0"; - sha256 = "0ifbkjsgjilczmqn2lpkw4jl648hns06klx07md9y3sc5i5jqjjq"; + rev = "33aaabe672f120050fd34264719e27a9bf518f18"; + sha256 = "1zsnhlcch4wgs69zjxdxaczxpi8ypscxgmjc41v2qwk4vmjlqlv1"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -3180,12 +3180,12 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-05-09"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "91f3c9fb469527a75163b8460128aade3b34e4a5"; - sha256 = "19mapmqff6b80g70ybmwp9mc113wal7dgjfsx516dh21gcx3v98h"; + rev = "cd8a10b9191ead80802100e00e741dcc89304634"; + sha256 = "06s4q9d18j2hanwxardsbbc4dzjwdb5z5xyrn1h2i5dlvfkyj2dl"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -3324,12 +3324,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-30"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "4ce0b6462b33b3857e5cd9c91c9f9ac33ae0357f"; - sha256 = "0n267lvr5sgn1n135bc1bhfxjlkcf2r1ydiccbcqs4mf8kjsj4hw"; + rev = "f1fd61642c687f37f14e3f947c840e0f33e4b09a"; + sha256 = "0d8bz0khmvrrcpcyrnwagykj4hmbr55a8g39qrwm3zkmry5if4qg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3444,12 +3444,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-04"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "53d0820fdacd8a5b3c20397a691b12c84a5a0aaa"; - sha256 = "190iw5449ybsaz3y9w5yy5kybr06cih4vkf75jg09lp4mx8z2anb"; + rev = "5bf694fce51f0711e3e005e105992178d87a86c6"; + sha256 = "1ka3hqcyjbrnawiz4wx35qpql3jxl0vllnskz5vqhqr5gfl9rz5b"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3468,12 +3468,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-05-08"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9e0f764b675d987bbdd45af38531cc864c8cfc4c"; - sha256 = "1rw9jasxfxghja5dlfz75iiz5rshisjnwffhzdqa9mil0pvahjr8"; + rev = "efbb1c66d27eb5b4bfbcc1f59d3384e0641c8214"; + sha256 = "1sfc7890v4lgc7r4a5k922qbnc1lpjp3i8sj1jqqxd4a73x1nsvm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3504,12 +3504,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-04-23"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "522b26a8795994b719a921a03cfacb0d7dcabf78"; - sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v"; + rev = "4f1ace57fbeed1f4e5613ea8c9b414ff0833eade"; + sha256 = "1in2q3igq74m900rkchdcgfcy3h60663b58xn2ydlbjsbzhc7vrn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3863,6 +3863,18 @@ let meta.homepage = "https://github.com/python-mode/python-mode/"; }; + QFEnter = buildVimPluginFrom2Nix { + pname = "QFEnter"; + version = "2020-10-09"; + src = fetchFromGitHub { + owner = "yssl"; + repo = "QFEnter"; + rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb"; + sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54"; + }; + meta.homepage = "https://github.com/yssl/QFEnter/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2020-12-28"; @@ -4659,12 +4671,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-09"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c061c216bfe082384d542a487ce02e9aed6177df"; - sha256 = "1x4mhxwp9crs63a43wlph4jbl92192sl3hiwchwlim0g1wdar0ky"; + rev = "22a78a46364b1e79549267c9365a31684689ed08"; + sha256 = "0y0y37v0qikfi7p9a5c63knil70r4mk249hsyxjjgg2m3di8i29g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5464,12 +5476,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-05-06"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "236919da99a534307e5cf2b204ddf1e3c1a1816e"; - sha256 = "0vajjv8nw41n783vsfqy72z4r3m36s7wkfxs96scpga18v3xgqng"; + rev = "8c17472d0fe5a515ab3618edd0cad3dd16972e09"; + sha256 = "15k2agpi832wdfacf289fffkvgg8q2gc01y9fa8qsnhjqnlrqra9"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7135,12 +7147,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-05-10"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "ea2612d87a38ef2261f66063571eef06689bbb8e"; - sha256 = "0a7dxvl8p3n8kfm1abm1k2r9l6s230585521scgh8y1sh88zkpay"; + rev = "f30d2d2d3a60905a09b516f843c130232da10060"; + sha256 = "0fj4hn481n5rg7z9hkybzpa6zv1dqc120i6112c8wasl89rg6xl5"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9044,12 +9056,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-03"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "4e04a862cb37105acebac8b6ac5b275dc7865815"; - sha256 = "02z5imcj7dqhkjxizcxswikabnbnfx9fnrbqcwgn0xcnf80c5azg"; + rev = "2708e8e6ecc00bfd7d9fee923d287345553aba02"; + sha256 = "173l5rmg12rqcl7f0lq9f5shx94mf7f8793m74ls1v3k06xdcqj2"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9153,12 +9165,12 @@ let which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-09"; + version = "2021-05-11"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "1ccba9d0b553b08feaca9f432386f9c33bd1656f"; - sha256 = "0qarcdwyd1pbcaqzzhzq4sh8d278j1xxf90ibp6h1451fcvkymid"; + rev = "342c8cdb3651967c96c356eb2d79561c0c9273ee"; + sha256 = "1v1z8yk711gjd3qawj2vmwa5l9jmqqxfj9jjw9zq1m011msp18iv"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -9335,12 +9347,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-04-07"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fc32adfada0fac7a2f6088672e177d410c9e3ae1"; - sha256 = "051l2dig6861xzl6zg41d6a776jhms7v6a86cap1ipd2rxkqh5yh"; + rev = "9ec189bc76ed2850f916394ed8d6127290f51338"; + sha256 = "0xl2pxgmam5ls7a59bdvx3gyzcgsq3wvgby2c5667627kcq05j6s"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8dd07b20256..fd90458c865 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -772,6 +772,7 @@ ycm-core/YouCompleteMe Yggdroot/indentLine Yggdroot/LeaderF Yilin-Yang/vim-markbar +yssl/QFEnter yuki-yano/ncm2-dictionary yunlingz/ci_dark zah/nim.vim diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix new file mode 100644 index 00000000000..9450b4ec304 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -0,0 +1,20 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.12.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; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c"; + }; + + kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 1494508cb01..1b9dc8efc9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.19"; + version = "5.11.20"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "17gdlkixsy68j6c7lpkkk242x71rqj78hpqg3kp01fckj633za5n"; + sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index f9196fc1686..38bc7c3eaff 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -14,24 +14,27 @@ , libunwind , elfutils , orc -, python3 +, python3Packages , libuuid +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "tiscamera"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "TheImagingSource"; repo = pname; rev = "v-${pname}-${version}"; - sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g"; + sha256 = "0hpy9yhc4mn6w8gvzwif703smmcys0j2jqbz2xfghqxcyb0ykplj"; }; nativeBuildInputs = [ cmake pkg-config + python3Packages.wrapPython + wrapGAppsHook ]; buildInputs = [ @@ -47,33 +50,43 @@ stdenv.mkDerivation rec { libunwind elfutils orc - python3 libuuid + python3Packages.python + python3Packages.pyqt5 ]; + pythonPath = with python3Packages; [ pyqt5 pygobject3 ]; + + propagatedBuildInputs = pythonPath; + cmakeFlags = [ "-DBUILD_ARAVIS=OFF" # For GigE support. Won't need it as our camera is usb. "-DBUILD_GST_1_0=ON" "-DBUILD_TOOLS=ON" "-DBUILD_V4L2=ON" "-DBUILD_LIBUSB=ON" + "-DBUILD_TESTS=ON" "-DTCAM_INSTALL_UDEV=${placeholder "out"}/lib/udev/rules.d" "-DTCAM_INSTALL_UVCDYNCTRL=${placeholder "out"}/share/uvcdynctrl/data/199e" "-DTCAM_INSTALL_GST_1_0=${placeholder "out"}/lib/gstreamer-1.0" "-DTCAM_INSTALL_GIR=${placeholder "out"}/share/gir-1.0" "-DTCAM_INSTALL_TYPELIB=${placeholder "out"}/lib/girepository-1.0" "-DTCAM_INSTALL_SYSTEMD=${placeholder "out"}/etc/systemd/system" + "-DTCAM_INSTALL_PYTHON3_MODULES=${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages" + "-DGSTREAMER_1.0_INCLUDEDIR=${placeholder "out"}/include/gstreamer-1.0" # There are gobject introspection commands launched as part of the build. Those have a runtime # dependency on `libtcam` (which itself is built as part of this build). In order to allow # that, we set the dynamic linker's path to point on the build time location of the library. "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - postPatch = '' - substituteInPlace ./src/BackendLoader.cpp \ - --replace '"libtcam-v4l2.so"' "\"$out/lib/tcam-0/libtcam-v4l2.so\"" \ - --replace '"libtcam-aravis.so"' "\"$out/lib/tcam-0/libtcam-aravis.so\"" \ - --replace '"libtcam-libusb.so"' "\"$out/lib/tcam-0/libtcam-libusb.so\"" + doCheck = true; + + # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression. + checkPhase = "ctest --force-new-ctest-process -E gstreamer"; + + postFixup = '' + wrapPythonPrograms "$out $pythonPath" ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e6b7de29fd2..2578d09fc1e 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20210219"; + version = "1.0.20210424"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "sha256-ZYZBnfX8DP0IV3VEBSzg7wnFCnlCzOT6Ql3kFZ0klfQ="; + sha256 = "sha256-VLtIxYh308X28c9EOeHx0eA7HP2aRlekPXRt015/qAg="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 3e6641b8d26..3d461d022de 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.3.0"; + version = "2.4.0"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "03cbbr8z9g156lgx7pyn1p1i4mh8ayhhhv24r1z3h1vgq6y4ka7r"; + sha256 = "sha256-gPw6o9B1jV1XQ86zlfrbJqUtVWMWArV8zMHIm6Wkz1M="; }; - vendorSha256 = "0gpzxjiyv7l1nibh1gas4mvinamiyyfgidd8cy4abz95v6z437lp"; + vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2b407074caf..11adceb0f74 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.5"; + version = "3.0.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802"; + sha256 = "63756ac5a00c3e4a066ed231a287faef5963a9183d77326e30bf0644cdf74f86"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 1a5bd4370d7..b87d11809b1 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; - NIX_CFLAGS_COMPILE = "-Wno-error=enum-conversion"; + + # On gcc9, this would produce + # error: '-Werror=enum-conversion': no option -Wenum-conversion + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast stdenv.cc.version "10") + "-Wno-error=enum-conversion"; enableParallelBuilding = true; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index b41153caeb8..95308772165 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; checkFlags = [ # Username and Password use the same ports and causes collision diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index fbefca063a8..b807a1ff757 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -20,9 +20,19 @@ buildGoModule rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ]; + buildInputs = [ taglib alsaLib ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; + # TODO(Profpatsch): write a test for transcoding support, + # since it is prone to break + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + '"ffmpeg"' \ + '"${lib.getBin ffmpeg}/bin/ffmpeg"' + ''; + meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index afaef82d372..844ea8976d7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.5.2"; + version = "2021.5.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 11bf2c744d3..a9d3ae02ea1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.2"; + hassVersion = "2021.5.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1v1ah0kdkhx0pkma2qnk56iv00r2lb4i3sfpwlcr64gfkpzpakv8"; + sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 3d9d4b21c40..1b8ef94fae9 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2 }: +{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: stdenv.mkDerivation rec { - name = "mod_python-3.5.0"; + pname = "mod_python"; + version = "3.5.0"; src = fetchurl { - url = "http://dist.modpython.org/dist/${name}.tgz"; + url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; }; @@ -24,7 +25,8 @@ stdenv.mkDerivation rec { passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ]; + buildInputs = [ apacheHttpd python2 ] + ++ lib.optional stdenv.isDarwin libintl; meta = { homepage = "http://modpython.org/"; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index fc75003f392..e8bf832a15c 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -67,6 +67,9 @@ stdenv.mkDerivation { url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; inherit sha256; }; + patches = [ + ./libtiff-4.2.patch # adjust configure check to work with libtiff > 4.1 + ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and # hardcode their absolute paths in the new package. diff --git a/pkgs/servers/hylafaxplus/libtiff-4.2.patch b/pkgs/servers/hylafaxplus/libtiff-4.2.patch new file mode 100644 index 00000000000..5da106565f0 --- /dev/null +++ b/pkgs/servers/hylafaxplus/libtiff-4.2.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 7456dcb..90f0e8d 100755 +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01]) tiff_runlen_t="uint32" ++ 4.[012]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 6c1e05bbdbd..122d00c5f0a 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { s:^# \(LOOKUP_MYSQL_PC=libmysqlclient\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: s:^# \(LOOKUP_LIBS\)=.*:\1=-lmysqlclient -L${libmysqlclient}/lib/mysql -lssl -ldl -lm -lpthread -lz: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient}/include/mysql/: + s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${libmysqlclient.dev}/include/mysql/: ''} ${lib.optionalString enableAuthDovecot '' s:^# \(AUTH_DOVECOT\)=.*:\1=yes: diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 69bfa34e586..21cd4a6b86c 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.33.1"; + version = "1.33.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE="; + sha256 = "sha256-9WZjuVvWpzCR1MjeMXfja/YV2YFHdo7QbjgUWDymCpM="; }; patches = [ diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b0d7f1048bc..290fce257f1 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,5 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: +let + # The web client verifies, that the server version is a valid datetime string: + # https://github.com/minio/minio/blob/3a0e7347cad25c60b2e51ff3194588b34d9e424c/browser/app/js/web.js#L51-L53 + # + # Example: + # versionToTimestamp "2021-04-22T15-44-28Z" + # => "2021-04-22T15:44:28Z" + versionToTimestamp = version: + let + splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; + in + builtins.concatStringsSep "" [ (builtins.elemAt splitTS 0) (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) ]; +in buildGoModule rec { pname = "minio"; version = "2021-04-22T15-44-28Z"; @@ -18,7 +31,7 @@ buildGoModule rec { subPackages = [ "." ]; patchPhase = '' - sed -i "s/Version.*/Version = \"${version}\"/g" cmd/build-constants.go + sed -i "s/Version.*/Version = \"${versionToTimestamp version}\"/g" cmd/build-constants.go sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 8d4d37304f3..27013c2a778 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { name = "grafana-image-renderer"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-3zvtlBjg+Yv5XDWdIN9HHLf+/Gv06ctbBaFhCgHeAMU="; + sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 6da9178aa88..36f9a329769 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -25,22 +25,21 @@ "express": "^4.16.3", "express-prom-bundle": "^5.1.5", "google-protobuf": "3.5.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "minimist": "^1.2.0", "morgan": "^1.9.0", - "mz": "^2.7.0", "prom-client": "^11.5.3", - "puppeteer": "^2.0.0", - "puppeteer-cluster": "^0.18.0", + "puppeteer": "^3.3.0", + "puppeteer-cluster": "^0.22.0", "unique-filename": "^1.1.0", "winston": "^3.2.1" }, "devDependencies": { "@types/express": "^4.11.1", - "@types/node": "^10.0.9", - "husky": "^3.1.0", + "@types/node": "^14.14.41", + "husky": "^4.3.8", "lint-staged": "^9.5.0", - "pkg": "4.4.8", + "pkg": "^5.1.0", "prettier": "^1.19.1", "tsc-watch": "^4.2.3", "typescript": "^3.8.3" @@ -61,9 +60,9 @@ }, "bin": "build/app.js", "engines": { - "node": ">=12 <13" + "node": ">=14 <15" }, "volta": { - "node": "12.19.0" + "node": "14.16.1" } } diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index ca082343546..cf769ed5920 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -2,43 +2,61 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": +"@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: "@babel/highlight" "^7.10.4" -"@babel/helper-validator-identifier@^7.10.4": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/code-frame@^7.0.0": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" + integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + dependencies: + "@babel/highlight" "^7.12.13" -"@babel/highlight@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" - integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== +"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.10.4" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.9.4": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" - integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== +"@babel/parser@7.13.13": + version "7.13.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" + integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== -"@babel/runtime@^7.9.2": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" - integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== +"@babel/types@7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" + integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== dependencies: - regenerator-runtime "^0.13.4" + "@babel/helper-validator-identifier" "^7.12.11" + lodash "^4.17.19" + to-fast-properties "^2.0.0" -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -47,56 +65,55 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" "@grpc/grpc-js@^1.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz#7fa2ba293ccc1e91b24074c2628c8c68336e18c4" - integrity sha512-JKV3f5Bv2TZxK6eJSB9EarsZrnLxrvcFNwI9goq0YRXa3S6NNoCSnI3cG3lkXVIJ03Wng1WXe76kc2JQtRe7AQ== + version "1.3.0" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz#c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb" + integrity sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q== dependencies: - semver "^6.2.0" + "@types/node" ">=12.12.47" "@grpc/proto-loader@^0.5.4": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz#038a3820540f621eeb1b05d81fbedfb045e14de0" - integrity sha512-HTM4QpI9B2XFkPz7pjwMyMgZchJ93TVkL3kWPW8GDMDKYxsMnmf4w2TNMJK7+KNiYHS5cJrCEAFlF+AwtXWVPA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" + integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== dependencies: lodash.camelcase "^4.3.0" protobufjs "^6.8.6" "@hapi/boom@^9.1.0": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz#0d9517657a56ff1e0b42d0aca9da1b37706fec56" - integrity sha512-4nZmpp4tXbm162LaZT45P7F7sgiem8dwAh2vHWT6XX24dozNjGMg6BvKCRvtCUcmcXqeMIUqWN8Rc5X8yKuROQ== + version "9.1.2" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz#48bd41d67437164a2d636e3b5bc954f8c8dc5e38" + integrity sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q== dependencies: "@hapi/hoek" "9.x.x" "@hapi/hoek@9.x.x": - version "9.1.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz#6c9eafc78c1529248f8f4d92b0799a712b6052c6" - integrity sha512-i9YbZPN3QgfighY/1X1Pu118VUz2Fmmhd6b2n0/O8YVgGGfw0FbUYoA97k7FkpGJ+pLCFEDLUmAPPV4D1kpeFw== + version "9.2.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" + integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== -"@nodelib/fs.scandir@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" - integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== +"@nodelib/fs.scandir@2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: - "@nodelib/fs.stat" "2.0.3" + "@nodelib/fs.stat" "2.0.4" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" - integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" - integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + version "1.2.6" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: - "@nodelib/fs.scandir" "2.1.3" + "@nodelib/fs.scandir" "2.1.4" fastq "^1.6.0" "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": @@ -153,87 +170,88 @@ integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= "@samverschueren/stream-to-observable@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" - integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== + version "0.3.1" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301" + integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ== dependencies: any-observable "^0.3.0" "@types/body-parser@*": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz#18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897" - integrity sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w== + version "1.19.0" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" + integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== dependencies: "@types/connect" "*" "@types/node" "*" "@types/connect@*": - version "3.4.33" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" - integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== + version "3.4.34" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" + integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== dependencies: "@types/node" "*" -"@types/events@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" - integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== - -"@types/express-serve-static-core@*": - version "4.17.1" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz#82be64a77211b205641e0209096fd3afb62481d3" - integrity sha512-9e7jj549ZI+RxY21Cl0t8uBnWyb22HzILupyHZjYEVK//5TT/1bZodU+yUbLnPdoYViBBnNWbxp4zYjGV0zUGw== +"@types/express-serve-static-core@^4.17.18": + version "4.17.19" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d" + integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA== dependencies: "@types/node" "*" + "@types/qs" "*" "@types/range-parser" "*" "@types/express@^4.11.1": - version "4.17.2" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c" - integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA== + version "4.17.11" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" + integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== dependencies: "@types/body-parser" "*" - "@types/express-serve-static-core" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" "@types/serve-static" "*" "@types/glob@^7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + version "7.1.3" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" + integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== dependencies: - "@types/events" "*" "@types/minimatch" "*" "@types/node" "*" -"@types/long@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" - integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== +"@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== -"@types/mime@*": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" - integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== -"@types/node@*": - version "13.1.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz#1d590429fe8187a02707720ecf38a6fe46ce294b" - integrity sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== -"@types/node@^10.0.9", "@types/node@^10.1.0": - version "10.17.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" - integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== +"@types/node@^14.14.41": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/qs@*": + version "6.9.6" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" + integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== "@types/range-parser@*": version "1.2.3" @@ -241,12 +259,19 @@ integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== "@types/serve-static@*": - version "1.13.3" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1" - integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g== + version "1.13.9" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" + integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== dependencies: - "@types/express-serve-static-core" "*" - "@types/mime" "*" + "@types/mime" "^1" + "@types/node" "*" + +"@types/yauzl@^2.9.1": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" + integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA== + dependencies: + "@types/node" "*" accepts@~1.3.7: version "1.3.7" @@ -266,17 +291,15 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -agent-base@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" - integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== - dependencies: - es6-promisify "^5.0.0" +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== aggregate-error@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0" - integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== dependencies: clean-stack "^2.0.0" indent-string "^4.0.0" @@ -291,20 +314,10 @@ ajv@^6.10.0, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.5.5: - version "6.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" - integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" - integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== +ajv@^8.0.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" + integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -360,10 +373,18 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" argparse@^1.0.7: version "1.0.10" @@ -382,74 +403,59 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - -async@^2.6.1: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== - dependencies: - lodash "^4.17.14" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +async@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -aws4@^1.8.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" - integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -basic-auth@~2.0.0: +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== dependencies: safe-buffer "5.1.2" -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - bintrees@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -481,15 +487,18 @@ braces@^3.0.1: dependencies: fill-range "^7.0.1" -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= -byline@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" - integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" bytes@3.1.0: version "3.1.0" @@ -520,11 +529,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -545,21 +549,18 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== ci-info@^2.0.0: version "2.0.0" @@ -586,6 +587,15 @@ cli-truncate@^0.2.1: slice-ansi "0.0.4" string-width "^1.0.1" +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -616,9 +626,9 @@ color-name@^1.0.0, color-name@~1.1.4: integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== + version "1.5.5" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" + integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -631,11 +641,6 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -colornames@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= - colors@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -649,32 +654,25 @@ colorspace@1.1.x: color "3.0.x" text-hex "1.0.x" -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +compare-versions@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= content-disposition@0.5.3: version "0.5.3" @@ -698,7 +696,7 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -713,36 +711,18 @@ cosmiconfig@^5.2.1: js-yaml "^3.13.1" parse-json "^4.0.0" -cross-spawn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" - integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" -cross-spawn@^7.0.2: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -751,13 +731,6 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - date-fns@^1.27.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" @@ -770,32 +743,30 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -debug@^4.0.1, debug@^4.1.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== dependencies: - ms "^2.1.1" + mimic-response "^2.0.0" dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -815,29 +786,30 @@ del@^5.0.0: rimraf "^3.0.0" slash "^3.0.0" -delayed-stream@~1.0.0: +delegates@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -diagnostics@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" - integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== - dependencies: - colorspace "1.1.x" - enabled "1.0.x" - kuler "1.0.x" +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= dir-glob@^3.0.1: version "3.0.1" @@ -854,17 +826,9 @@ doctrine@^3.0.0: esutils "^2.0.2" duplexer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - -ecc-jsbn@~0.1.1: version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== ee-first@1.1.1: version "1.1.1" @@ -881,19 +845,17 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0: +end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -907,11 +869,6 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" -env-variable@0.0.x: - version "0.0.5" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88" - integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -919,17 +876,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - -es6-promisify@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" - integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= - dependencies: - es6-promise "^4.0.3" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== escape-html@~1.0.3: version "1.0.3" @@ -941,13 +891,13 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" - integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: @@ -974,17 +924,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint@^7.13.0: - version "7.18.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" - integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: - "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.3.0" + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -995,12 +945,12 @@ eslint@^7.13.0: eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -1008,7 +958,7 @@ eslint@^7.13.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -1035,10 +985,10 @@ esprima@^4.0.0, esprima@^4.0.1: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" @@ -1049,7 +999,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -1082,19 +1032,6 @@ event-stream@=3.3.4: stream-combiner "~0.0.4" through "~2.3.1" -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" @@ -1159,51 +1096,26 @@ express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extract-zip@^1.6.6: - version "1.6.7" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" - integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= +extract-zip@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== dependencies: - concat-stream "1.6.2" - debug "2.6.9" - mkdirp "0.5.1" - yauzl "2.4.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82" - integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" - merge2 "^1.3.0" - micromatch "^4.0.2" - -fast-glob@^3.1.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d" - integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A== +fast-glob@^3.0.3, fast-glob@^3.1.1: + version "3.2.5" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" + integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -1228,23 +1140,23 @@ fast-safe-stringify@^2.0.4: integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== fastq@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" - integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== dependencies: - reusify "^1.0.0" + reusify "^1.0.4" -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= dependencies: pend "~1.2.0" -fecha@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" - integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== +fecha@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" + integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== figures@^1.7.0: version "1.7.0" @@ -1261,10 +1173,10 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -1288,14 +1200,21 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== dependencies: - locate-path "^5.0.0" + locate-path "^6.0.0" path-exists "^4.0.0" +find-versions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" + integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== + dependencies: + semver-regex "^3.1.2" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1305,23 +1224,19 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" - integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" +follow-redirects@^1.10.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" + integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== forwarded@~0.1.2: version "0.1.2" @@ -1346,67 +1261,76 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== dependencies: + at-least-node "^1.0.0" graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" + jsonfile "^6.0.1" + universalify "^2.0.0" fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== -get-stdin@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" - integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== +get-stream@^5.0.0, get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -glob-parent@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== - dependencies: - is-glob "^4.0.1" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== +glob-parent@^5.0.0, glob-parent@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -1429,6 +1353,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -1443,10 +1374,10 @@ globby@^10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154" - integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg== +globby@^11.0.3: + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -1460,28 +1391,10 @@ google-protobuf@3.5.0: resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= -graceful-fs@^4.1.6, graceful-fs@^4.2.2: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -graceful-fs@^4.2.0: - version "4.2.4" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" - integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== has-ansi@^2.0.0: version "2.0.0" @@ -1500,10 +1413,17 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -hosted-git-info@^2.1.4: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" http-errors@1.7.2: version "1.7.2" @@ -1527,39 +1447,29 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-proxy-agent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" - integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== dependencies: - agent-base "^4.3.0" - debug "^3.1.0" + agent-base "5" + debug "4" -husky@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz#5faad520ab860582ed94f0c1a77f0f04c90b57c0" - integrity sha512-FJkPoHHB+6s4a+jwPqBudBDvYZsoQW5/HBuMSehC8qDiCe50kpcxeqFoDSlow+9I6wg47YxBoT3WxaURlrDIIQ== +husky@^4.3.8: + version "4.3.8" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" + integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== dependencies: - chalk "^2.4.2" + chalk "^4.0.0" ci-info "^2.0.0" - cosmiconfig "^5.2.1" - execa "^1.0.0" - get-stdin "^7.0.0" + compare-versions "^3.6.0" + cosmiconfig "^7.0.0" + find-versions "^4.0.0" opencollective-postinstall "^2.0.2" - pkg-dir "^4.2.0" + pkg-dir "^5.0.0" please-upgrade-node "^3.2.0" - read-pkg "^5.2.0" - run-node "^1.0.0" slash "^3.0.0" + which-pm-runs "^1.0.0" iconv-lite@0.4.24: version "0.4.24" @@ -1568,15 +1478,20 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.1.1, ignore@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== import-fresh@^2.0.0: version "2.0.0" @@ -1617,7 +1532,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1627,18 +1542,23 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -into-stream@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz#f9a20a348a11f3c13face22763f2d02e127f4db8" - integrity sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA== +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +into-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" + integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== dependencies: from2 "^2.3.0" p-is-promise "^3.0.0" -ipaddr.js@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" - integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== is-arrayish@^0.2.1: version "0.2.1" @@ -1650,6 +1570,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-core-module@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + dependencies: + has "^1.0.3" + is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" @@ -1707,14 +1634,14 @@ is-path-cwd@^2.2.0: integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== is-path-inside@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== is-regexp@^1.0.0: version "1.0.0" @@ -1731,11 +1658,6 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -1746,11 +1668,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -1764,16 +1681,16 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -1784,44 +1701,24 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" optionalDependencies: graceful-fs "^4.1.6" -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kuler@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" - integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== - dependencies: - colornames "^1.1.1" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== levn@^0.4.1: version "0.4.1" @@ -1908,27 +1805,37 @@ listr@^0.14.3: p-map "^2.0.0" rxjs "^6.3.3" -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== dependencies: - p-locate "^4.1.0" + p-locate "^5.0.0" lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash@^4.17.14, lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash@^4.17.19, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^1.0.2: version "1.0.2" @@ -1953,14 +1860,14 @@ log-update@^2.3.0: cli-cursor "^2.0.0" wrap-ansi "^3.0.1" -logform@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360" - integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ== +logform@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" + integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== dependencies: colors "^1.2.1" fast-safe-stringify "^2.0.4" - fecha "^2.3.3" + fecha "^4.2.0" ms "^2.1.1" triple-beam "^1.3.0" @@ -1969,14 +1876,6 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -lru-cache@^4.0.1: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -2005,9 +1904,9 @@ merge-stream@^2.0.0: integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== merge2@^1.2.3, merge2@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" - integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== methods@~1.1.2: version "1.1.2" @@ -2015,24 +1914,24 @@ methods@~1.1.2: integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.43.0: - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== +mime-types@~2.1.24: + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.43.0" + mime-db "1.47.0" mime@1.6.0: version "1.6.0" @@ -2040,9 +1939,9 @@ mime@1.6.0: integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.0.3: - version "2.4.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" - integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== mimic-fn@^1.0.0: version "1.2.0" @@ -2054,6 +1953,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -2061,40 +1965,26 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== morgan@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" - integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA== + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== dependencies: - basic-auth "~2.0.0" + basic-auth "~2.0.1" debug "2.6.9" - depd "~1.1.2" + depd "~2.0.0" on-finished "~2.3.0" - on-headers "~1.0.1" + on-headers "~1.0.2" ms@2.0.0: version "2.0.0" @@ -2116,22 +2006,18 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multistream@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz#629d3a29bd76623489980d04519a2c365948148c" - integrity sha512-xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ== +multistream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" + integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== dependencies: - inherits "^2.0.1" - readable-stream "^2.0.5" + once "^1.4.0" + readable-stream "^3.6.0" -mz@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== natural-compare@^1.4.0: version "1.4.0" @@ -2143,38 +2029,28 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.7.0: + version "2.26.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40" + integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ== + dependencies: + semver "^5.4.1" node-cleanup@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= normalize-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - npm-run-path@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" @@ -2182,17 +2058,22 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -2204,7 +2085,7 @@ on-finished@^2.3.0, on-finished@~2.3.0: dependencies: ee-first "1.1.1" -on-headers@~1.0.1: +on-headers@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== @@ -2216,10 +2097,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -one-time@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" onetime@^2.0.0: version "2.0.1" @@ -2229,16 +2112,16 @@ onetime@^2.0.0: mimic-fn "^1.0.0" onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" opencollective-postinstall@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" - integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== optionator@^0.8.1: version "0.8.3" @@ -2264,16 +2147,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - p-finally@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" @@ -2284,19 +2157,19 @@ p-is-promise@^3.0.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== -p-limit@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: - p-try "^2.0.0" + yocto-queue "^0.1.0" -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== dependencies: - p-limit "^2.2.0" + p-limit "^3.0.2" p-map@^2.0.0: version "2.1.0" @@ -2310,11 +2183,6 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -2331,13 +2199,13 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" parseurl@~1.3.3: @@ -2355,11 +2223,6 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -2392,63 +2255,50 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.5: - version "2.2.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" - integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== - -picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.2.1, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== dependencies: - find-up "^4.0.0" + find-up "^5.0.0" -pkg-fetch@^2.6.7: - version "2.6.8" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz#458ba6b9c936de1b0f3f9c830f389888561e630f" - integrity sha512-CFG7jOeVD38lltLGA7xCJxYsD//GKLjl1P9tc/n9By2a4WEHQjfkBMrYdMS8WOHVP+r9L20fsZNbaKcubDAiQg== +pkg-fetch@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz#8321eff936bf4eb088a333cf23494be0ded173b7" + integrity sha512-XgMXcco5hy0/Q7OXfQ/FbBnPvS4e7gWB9BCcUWUgaHYo3JretihmJjr62EZWmxAjvodoWLGMZ3E7XHf8Q2LfBg== dependencies: - "@babel/runtime" "^7.9.2" - byline "^5.0.0" - chalk "^3.0.0" - expand-template "^2.0.3" - fs-extra "^8.1.0" - minimist "^1.2.5" + axios "^0.21.1" + chalk "^4.1.0" + fs-extra "^9.1.0" progress "^2.0.3" - request "^2.88.0" - request-progress "^3.0.0" - semver "^6.3.0" - unique-temp-dir "^1.0.0" - -pkg@4.4.8: - version "4.4.8" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz#145fb81f31eebfb90d2010dd2c4b663ca0db4009" - integrity sha512-Fqqv0iaX48U3CFZxd6Dq6JKe7BrAWbgRAqMJkz/m8W3H5cqJ6suvsUWe5AJPRlN/AhbBYXBJ0XG9QlYPTXcVFA== - dependencies: - "@babel/parser" "^7.9.4" - "@babel/runtime" "^7.9.2" - chalk "^3.0.0" - escodegen "^1.14.1" - fs-extra "^8.1.0" - globby "^11.0.0" - into-stream "^5.1.1" + semver "^7.3.5" + yargs "^16.2.0" + +pkg@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz#25f92666a4164bbc5495c862de9370ed48788667" + integrity sha512-rWTwvLJakQnEVg03s97KNtGkhM3pPfxk7XinjR7H1bToMZQMNpBTwahrAPoFHdQyfn6odI76DP6vX3Br9VubNQ== + dependencies: + "@babel/parser" "7.13.13" + "@babel/types" "7.13.12" + chalk "^4.1.0" + escodegen "^2.0.0" + fs-extra "^9.1.0" + globby "^11.0.3" + into-stream "^6.0.0" minimist "^1.2.5" - multistream "^2.1.1" - pkg-fetch "^2.6.7" + multistream "^4.1.0" + pkg-fetch "3.0.4" + prebuild-install "6.0.1" progress "^2.0.3" - resolve "^1.15.1" + resolve "^1.20.0" stream-meter "^1.0.4" + tslib "2.1.0" please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: version "3.2.0" @@ -2457,6 +2307,27 @@ please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" +prebuild-install@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz#5902172f7a40eb67305b96c2a695db32636ee26d" + integrity sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.7.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + which-pm-runs "^1.0.0" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -2490,9 +2361,9 @@ prom-client@^11.5.3: tdigest "^0.1.1" protobufjs@^6.8.6: - version "6.8.8" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c" - integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw== + version "6.11.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" + integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -2504,22 +2375,22 @@ protobufjs@^6.8.6: "@protobufjs/path" "^1.1.2" "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - "@types/node" "^10.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" long "^4.0.0" proxy-addr@~2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" - integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== dependencies: forwarded "~0.1.2" - ipaddr.js "1.9.0" + ipaddr.js "1.9.1" proxy-from-env@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" - integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== ps-tree@^1.2.0: version "1.2.0" @@ -2528,16 +2399,6 @@ ps-tree@^1.2.0: dependencies: event-stream "=3.3.4" -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== - pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -2546,41 +2407,43 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -puppeteer-cluster@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz#189ef1cea474590aa4d42c9a665dc319689e8fad" - integrity sha512-sMhK7foa+gq8khtgvKar6xwIjmPFS92ZrDsnpMHcQMX2Q8hWmVSViHG7RhuAOmbfIbS7Ya+lViXlx1xtgUjarQ== +puppeteer-cluster@^0.22.0: + version "0.22.0" + resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" + integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== dependencies: debug "^4.1.1" -puppeteer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz#0612992e29ec418e0a62c8bebe61af1a64d7ec01" - integrity sha512-t3MmTWzQxPRP71teU6l0jX47PHXlc4Z52sQv4LJQSZLq1ttkKS2yGM3gaI57uQwZkNaoGd0+HPPMELZkcyhlqA== +puppeteer@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7" + integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw== dependencies: debug "^4.1.0" - extract-zip "^1.6.6" - https-proxy-agent "^3.0.0" + extract-zip "^2.0.0" + https-proxy-agent "^4.0.0" mime "^2.0.3" progress "^2.0.1" proxy-from-env "^1.0.0" - rimraf "^2.6.1" - ws "^6.1.0" + rimraf "^3.0.2" + tar-fs "^2.0.0" + unbzip2-stream "^1.3.3" + ws "^7.2.3" qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== range-parser@~1.2.1: version "1.2.1" @@ -2597,17 +2460,17 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" -readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.7: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -2620,57 +2483,24 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.1.4, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606" - integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA== +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" util-deprecate "^1.0.1" -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== - regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== -request-progress@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" - integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= - dependencies: - throttleit "^1.0.0" - -request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= require-from-string@^2.0.2: version "2.0.2" @@ -2687,18 +2517,12 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.10.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" - integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== - dependencies: - path-parse "^1.0.6" - -resolve@^1.15.1: - version "1.17.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" - integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== +resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: + is-core-module "^2.2.0" path-parse "^1.0.6" restore-cursor@^2.0.0: @@ -2709,46 +2533,29 @@ restore-cursor@^2.0.0: onetime "^2.0.0" signal-exit "^3.0.2" -reusify@^1.0.0: +reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.6.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" - integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" -run-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" - integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== - run-parallel@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" - integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" rxjs@^6.3.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" @@ -2757,12 +2564,12 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -2772,20 +2579,20 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -"semver@2 || 3 || 4 || 5", semver@^5.5.0: +semver-regex@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807" + integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA== + +semver@^5.4.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.2.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== +semver@^7.2.1, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -2818,18 +2625,16 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -2837,20 +2642,29 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" simple-swizzle@^0.2.2: version "0.2.2" @@ -2883,32 +2697,6 @@ source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== - split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -2921,21 +2709,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -2979,7 +2752,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -2987,10 +2760,10 @@ string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -3040,11 +2813,6 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -3055,6 +2823,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -3080,14 +2853,38 @@ symbol-observable@^1.1.0: integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== - dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + version "6.6.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" + integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.flatten "^4.4.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" + +tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" tdigest@^0.1.1: version "0.1.1" @@ -3106,30 +2903,16 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.0" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" - integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= - dependencies: - any-promise "^1.0.0" - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - -through@2, through@~2.3, through@~2.3.1: +through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -3142,34 +2925,31 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== tsc-watch@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz#630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b" - integrity sha512-M1Lo37+ggVfavGX3ObUVMz9QBH7moqq2RlmBdxnz6a6etwecetznZ/ZgYOi2c9HQ4Ki2qStj7V9J/gSf0rThig== + version "4.2.9" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz#d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044" + integrity sha512-DlTaoDs74+KUpyWr7dCGhuscAUKCz6CiFduBN7R9RbLJSSN1moWdwoCLASE7+zLgGvV5AwXfYDiEMAsPGaO+Vw== dependencies: - cross-spawn "^5.1.0" + cross-spawn "^7.0.3" node-cleanup "^2.1.2" ps-tree "^1.2.0" string-argv "^0.1.1" - strip-ansi "^4.0.0" + strip-ansi "^6.0.0" + +tslib@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tunnel-agent@^0.6.0: version "0.6.0" @@ -3178,11 +2958,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -3197,10 +2972,10 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== type-fest@^0.8.1: version "0.8.1" @@ -3215,20 +2990,18 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - typescript@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + version "3.9.9" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674" + integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== -uid2@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" - integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= +unbzip2-stream@^1.3.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" unique-filename@^1.1.0: version "1.1.1" @@ -3244,19 +3017,10 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-temp-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz#6dce95b2681ca003eebfb304a415f9cbabcc5385" - integrity sha1-bc6VsmgcoAPuv7MEpBX5y6vMU4U= - dependencies: - mkdirp "^0.5.1" - os-tmpdir "^1.0.1" - uid2 "0.0.3" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" @@ -3271,9 +3035,9 @@ uri-js@^4.2.2: punycode "^2.1.0" url-value-parser@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz#c8179a095ab9ec1f5aa17ca36af5af396b4e95ed" - integrity sha512-bexECeREBIueboLGM3Y1WaAzQkIn+Tca/Xjmjmfd0S/hFHSCEoFkNh0/D0l9G4K74MkEP/lLFRlYnxX3d68Qgw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz#cd4b8d6754e458d65e8125260c09718d926e6e21" + integrity sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA== util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" @@ -3285,44 +3049,20 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= which@^2.0.1: version "2.0.2" @@ -3331,28 +3071,35 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -winston-transport@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" - integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A== +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== dependencies: - readable-stream "^2.3.6" + string-width "^1.0.2 || 2" + +winston-transport@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" + integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== + dependencies: + readable-stream "^2.3.7" triple-beam "^1.2.0" winston@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" - integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== + version "3.3.3" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" + integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== dependencies: - async "^2.6.1" - diagnostics "^1.1.1" - is-stream "^1.1.0" - logform "^2.1.1" - one-time "0.0.4" - readable-stream "^3.1.1" + "@dabh/diagnostics" "^2.0.2" + async "^3.1.0" + is-stream "^2.0.0" + logform "^2.2.0" + one-time "^1.0.0" + readable-stream "^3.4.0" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.3.0" + winston-transport "^4.4.0" word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" @@ -3367,31 +3114,67 @@ wrap-ansi@^3.0.1: string-width "^2.1.1" strip-ansi "^4.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" +ws@^7.2.3: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= dependencies: - fd-slicer "~1.0.1" + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 8b4c1ec31e5..53fbca36c22 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -10,99 +10,115 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { - name = "_babel_parser___parser_7.9.6.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; - sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; }; } { - name = "_babel_runtime___runtime_7.9.6.tgz"; + name = "_babel_parser___parser_7.13.13.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + name = "_babel_parser___parser_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz"; + sha1 = "42f03862f4aed50461e543270916b47dd501f0df"; }; } { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + name = "_babel_types___types_7.13.12.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + name = "_babel_types___types_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; + sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; }; } { - name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz"; - sha1 = "7fa2ba293ccc1e91b24074c2628c8c68336e18c4"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; }; } { - name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; path = fetchurl { - name = "_grpc_proto_loader___proto_loader_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.4.tgz"; - sha1 = "038a3820540f621eeb1b05d81fbedfb045e14de0"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; }; } { - name = "_hapi_boom___boom_9.1.0.tgz"; + name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; path = fetchurl { - name = "_hapi_boom___boom_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.0.tgz"; - sha1 = "0d9517657a56ff1e0b42d0aca9da1b37706fec56"; + name = "_grpc_grpc_js___grpc_js_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz"; + sha1 = "c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb"; }; } { - name = "_hapi_hoek___hoek_9.1.0.tgz"; + name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.0.tgz"; - sha1 = "6c9eafc78c1529248f8f4d92b0799a712b6052c6"; + name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; + sha1 = "1dea4b8a6412b05e2d58514d507137b63a52a98d"; }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + name = "_hapi_boom___boom_9.1.2.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + name = "_hapi_boom___boom_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz"; + sha1 = "48bd41d67437164a2d636e3b5bc954f8c8dc5e38"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + name = "_hapi_hoek___hoek_9.2.0.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + name = "_hapi_hoek___hoek_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz"; + sha1 = "f3933a44e365864f4dad5db94158106d511e8131"; }; } { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; + sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; + sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; + sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; }; } { @@ -186,107 +202,107 @@ }; } { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; path = fetchurl { - name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; - sha1 = "ecdf48d532c58ea477acfcab80348424f8d0662f"; + name = "_samverschueren_stream_to_observable___stream_to_observable_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; + sha1 = "a21117b19ee9be70c379ec1877537ef2e1c63301"; }; } { - name = "_types_body_parser___body_parser_1.17.1.tgz"; + name = "_types_body_parser___body_parser_1.19.0.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.1.tgz"; - sha1 = "18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"; + name = "_types_body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "0685b3c47eb3006ffed117cdd55164b61f80538f"; }; } { - name = "_types_connect___connect_3.4.33.tgz"; + name = "_types_connect___connect_3.4.34.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.33.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz"; - sha1 = "31610c901eca573b8713c3330abc6e6b9f588546"; + name = "_types_connect___connect_3.4.34.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz"; + sha1 = "170a40223a6d666006d93ca128af2beb1d9b1901"; }; } { - name = "_types_events___events_3.0.0.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha1 = "00acfc1632e729acac4f1530e9e16f6dd1508a1d"; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; + name = "_types_express___express_4.17.11.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz"; - sha1 = "82be64a77211b205641e0209096fd3afb62481d3"; + name = "_types_express___express_4.17.11.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz"; + sha1 = "debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"; }; } { - name = "_types_express___express_4.17.2.tgz"; + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz"; - sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_glob___glob_7.1.1.tgz"; + name = "_types_long___long_4.0.1.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + name = "_types_long___long_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz"; + sha1 = "459c65fa1867dafe6a8f322c4c51695663cc55e9"; }; } { - name = "_types_long___long_4.0.0.tgz"; + name = "_types_mime___mime_1.3.2.tgz"; path = fetchurl { - name = "_types_long___long_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz"; - sha1 = "719551d2352d301ac8b81db732acb6bdc28dbdef"; + name = "_types_mime___mime_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; + sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; }; } { - name = "_types_mime___mime_2.0.1.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_mime___mime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz"; - sha1 = "dc488842312a7f075149312905b5e3c0b054c79d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_13.1.8.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_13.1.8.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.1.8.tgz"; - sha1 = "1d590429fe8187a02707720ecf38a6fe46ce294b"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { - name = "_types_node___node_10.17.13.tgz"; + name = "_types_parse_json___parse_json_4.0.0.tgz"; path = fetchurl { - name = "_types_node___node_10.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz"; - sha1 = "ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"; + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; }; } { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + name = "_types_qs___qs_6.9.6.tgz"; path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + name = "_types_qs___qs_6.9.6.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz"; + sha1 = "df9c3c8b31a247ec315e6996566be3171df4b3b1"; }; } { @@ -298,11 +314,19 @@ }; } { - name = "_types_serve_static___serve_static_1.13.3.tgz"; + name = "_types_serve_static___serve_static_1.13.9.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1"; + name = "_types_serve_static___serve_static_1.13.9.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha1 = "aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"; + }; + } + { + name = "_types_yauzl___yauzl_2.9.1.tgz"; + path = fetchurl { + name = "_types_yauzl___yauzl_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; }; } { @@ -330,19 +354,19 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_5.1.1.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; }; } { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { @@ -354,19 +378,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; - path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; - }; - } - { - name = "ajv___ajv_7.0.3.tgz"; + name = "ajv___ajv_8.2.0.tgz"; path = fetchurl { - name = "ajv___ajv_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz"; - sha1 = "13ae747eff125cafb230ac504b2406cf371eece2"; + name = "ajv___ajv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; + sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; }; } { @@ -442,11 +458,19 @@ }; } { - name = "any_promise___any_promise_1.3.0.tgz"; + name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { - name = "any_promise___any_promise_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; }; } { @@ -474,22 +498,6 @@ }; } { - name = "asn1___asn1_0.2.4.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - } - { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; @@ -498,51 +506,43 @@ }; } { - name = "async_limiter___async_limiter_1.0.1.tgz"; + name = "async___async_3.2.0.tgz"; path = fetchurl { - name = "async_limiter___async_limiter_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; - sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; }; } { - name = "async___async_2.6.3.tgz"; + name = "at_least_node___at_least_node_1.0.0.tgz"; path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; }; } { - name = "asynckit___asynckit_0.4.0.tgz"; + name = "axios___axios_0.21.1.tgz"; path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + name = "axios___axios_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; + sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; }; } { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; - }; - } - { - name = "balanced_match___balanced_match_1.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } { @@ -554,14 +554,6 @@ }; } { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - } - { name = "bintrees___bintrees_1.0.1.tgz"; path = fetchurl { name = "bintrees___bintrees_1.0.1.tgz"; @@ -570,6 +562,14 @@ }; } { + name = "bl___bl_4.1.0.tgz"; + path = fetchurl { + name = "bl___bl_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; + sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + }; + } + { name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { name = "body_parser___body_parser_1.19.0.tgz"; @@ -594,19 +594,19 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; } { - name = "byline___byline_5.0.0.tgz"; + name = "buffer___buffer_5.7.1.tgz"; path = fetchurl { - name = "byline___byline_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; }; } { @@ -650,14 +650,6 @@ }; } { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - } - { name = "chalk___chalk_1.1.3.tgz"; path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; @@ -674,19 +666,19 @@ }; } { - name = "chalk___chalk_3.0.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -722,6 +714,14 @@ }; } { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { name = "code_point_at___code_point_at_1.1.0.tgz"; path = fetchurl { name = "code_point_at___code_point_at_1.1.0.tgz"; @@ -762,11 +762,11 @@ }; } { - name = "color_string___color_string_1.5.3.tgz"; + name = "color_string___color_string_1.5.5.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + name = "color_string___color_string_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; + sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; }; } { @@ -778,14 +778,6 @@ }; } { - name = "colornames___colornames_1.1.1.tgz"; - path = fetchurl { - name = "colornames___colornames_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; - }; - } - { name = "colors___colors_1.4.0.tgz"; path = fetchurl { name = "colors___colors_1.4.0.tgz"; @@ -802,14 +794,6 @@ }; } { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; - }; - } - { name = "commander___commander_2.20.3.tgz"; path = fetchurl { name = "commander___commander_2.20.3.tgz"; @@ -818,6 +802,14 @@ }; } { + name = "compare_versions___compare_versions_3.6.0.tgz"; + path = fetchurl { + name = "compare_versions___compare_versions_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz"; + sha1 = "1a5689913685e5a87637b8d3ffca75514ec41d62"; + }; + } + { name = "concat_map___concat_map_0.0.1.tgz"; path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; @@ -826,11 +818,11 @@ }; } { - name = "concat_stream___concat_stream_1.6.2.tgz"; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; } { @@ -882,27 +874,11 @@ }; } { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.1.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; }; } { @@ -914,14 +890,6 @@ }; } { - name = "dashdash___dashdash_1.14.1.tgz"; - path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - } - { name = "date_fns___date_fns_1.30.1.tgz"; path = fetchurl { name = "date_fns___date_fns_1.30.1.tgz"; @@ -938,14 +906,6 @@ }; } { - name = "debug___debug_3.2.6.tgz"; - path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; - }; - } - { name = "debug___debug_4.3.1.tgz"; path = fetchurl { name = "debug___debug_4.3.1.tgz"; @@ -954,11 +914,11 @@ }; } { - name = "debug___debug_4.1.1.tgz"; + name = "decompress_response___decompress_response_4.2.1.tgz"; path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; }; } { @@ -970,6 +930,14 @@ }; } { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { name = "deep_is___deep_is_0.1.3.tgz"; path = fetchurl { name = "deep_is___deep_is_0.1.3.tgz"; @@ -986,11 +954,11 @@ }; } { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; + name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; } { @@ -1002,6 +970,14 @@ }; } { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } + { name = "destroy___destroy_1.0.4.tgz"; path = fetchurl { name = "destroy___destroy_1.0.4.tgz"; @@ -1010,11 +986,11 @@ }; } { - name = "diagnostics___diagnostics_1.1.1.tgz"; + name = "detect_libc___detect_libc_1.0.3.tgz"; path = fetchurl { - name = "diagnostics___diagnostics_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz"; - sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a"; + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; } { @@ -1034,19 +1010,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -1074,11 +1042,11 @@ }; } { - name = "enabled___enabled_1.0.2.tgz"; + name = "enabled___enabled_2.0.0.tgz"; path = fetchurl { - name = "enabled___enabled_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + name = "enabled___enabled_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz"; + sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"; }; } { @@ -1106,14 +1074,6 @@ }; } { - name = "env_variable___env_variable_0.0.5.tgz"; - path = fetchurl { - name = "env_variable___env_variable_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz"; - sha1 = "913dd830bef11e96a039c038d4130604eba37f88"; - }; - } - { name = "error_ex___error_ex_1.3.2.tgz"; path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; @@ -1122,19 +1082,11 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; + name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; }; } { @@ -1154,11 +1106,11 @@ }; } { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; }; } { @@ -1186,19 +1138,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.18.0.tgz"; + name = "eslint___eslint_7.25.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.18.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; - sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; + name = "eslint___eslint_7.25.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; + sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; }; } { @@ -1218,11 +1170,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -1274,14 +1226,6 @@ }; } { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; - }; - } - { name = "execa___execa_2.1.0.tgz"; path = fetchurl { name = "execa___execa_2.1.0.tgz"; @@ -1314,35 +1258,11 @@ }; } { - name = "extend___extend_3.0.2.tgz"; - path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; - }; - } - { - name = "extract_zip___extract_zip_1.6.7.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; - }; - } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - } - { - name = "extsprintf___extsprintf_1.4.0.tgz"; + name = "extract_zip___extract_zip_2.0.1.tgz"; path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + name = "extract_zip___extract_zip_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; + sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; }; } { @@ -1354,19 +1274,11 @@ }; } { - name = "fast_glob___fast_glob_3.1.1.tgz"; - path = fetchurl { - name = "fast_glob___fast_glob_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz"; - sha1 = "87ee30e9e9f3eb40d6f254a7997655da753d7c82"; - }; - } - { - name = "fast_glob___fast_glob_3.2.2.tgz"; + name = "fast_glob___fast_glob_3.2.5.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz"; - sha1 = "ade1a9d91148965d4bf7c51f72e1ca662d32e63d"; + name = "fast_glob___fast_glob_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; + sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; }; } { @@ -1394,27 +1306,27 @@ }; } { - name = "fastq___fastq_1.6.0.tgz"; + name = "fastq___fastq_1.11.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz"; - sha1 = "4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"; + name = "fastq___fastq_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; + sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } { - name = "fecha___fecha_2.3.3.tgz"; + name = "fecha___fecha_4.2.1.tgz"; path = fetchurl { - name = "fecha___fecha_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz"; - sha1 = "948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"; + name = "fecha___fecha_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz"; + sha1 = "0a83ad8f86ef62a091e22bb5a039cd03d23eecce"; }; } { @@ -1434,11 +1346,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -1458,11 +1370,19 @@ }; } { - name = "find_up___find_up_4.1.0.tgz"; + name = "find_up___find_up_5.0.0.tgz"; path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + name = "find_up___find_up_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; + sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + }; + } + { + name = "find_versions___find_versions_4.0.0.tgz"; + path = fetchurl { + name = "find_versions___find_versions_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz"; + sha1 = "3c57e573bf97769b8cb8df16934b627915da4965"; }; } { @@ -1474,27 +1394,27 @@ }; } { - name = "flatted___flatted_3.1.0.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; - sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { - name = "forever_agent___forever_agent_0.6.1.tgz"; + name = "fn.name___fn.name_1.1.0.tgz"; path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + name = "fn.name___fn.name_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz"; + sha1 = "26cad8017967aea8731bc42961d04a3d5988accc"; }; } { - name = "form_data___form_data_2.3.3.tgz"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; + sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; }; } { @@ -1530,11 +1450,19 @@ }; } { - name = "fs_extra___fs_extra_8.1.0.tgz"; + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_9.1.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; }; } { @@ -1546,67 +1474,67 @@ }; } { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; } { - name = "get_stdin___get_stdin_7.0.0.tgz"; + name = "gauge___gauge_2.7.4.tgz"; path = fetchurl { - name = "get_stdin___get_stdin_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz"; - sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6"; + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; } { - name = "get_stream___get_stream_4.1.0.tgz"; + name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { - name = "getpass___getpass_0.1.7.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "github_from_package___github_from_package_0.0.0.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; }; } { - name = "glob_parent___glob_parent_5.1.0.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz"; - sha1 = "5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -1626,6 +1554,14 @@ }; } { + name = "globals___globals_13.8.0.tgz"; + path = fetchurl { + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } + { name = "globby___globby_10.0.2.tgz"; path = fetchurl { name = "globby___globby_10.0.2.tgz"; @@ -1634,11 +1570,11 @@ }; } { - name = "globby___globby_11.0.0.tgz"; + name = "globby___globby_11.0.3.tgz"; path = fetchurl { - name = "globby___globby_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz"; - sha1 = "56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154"; + name = "globby___globby_11.0.3.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; + sha1 = "9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"; }; } { @@ -1650,35 +1586,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; - }; - } - { - name = "har_schema___har_schema_2.0.0.tgz"; - path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - } - { - name = "har_validator___har_validator_5.1.3.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; }; } { @@ -1706,11 +1618,19 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; - sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; }; } { @@ -1730,27 +1650,19 @@ }; } { - name = "http_signature___http_signature_1.2.0.tgz"; - path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; - sha1 = "b8c286433e87602311b01c8ea34413d856a4af81"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; }; } { - name = "husky___husky_3.1.0.tgz"; + name = "husky___husky_4.3.8.tgz"; path = fetchurl { - name = "husky___husky_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/husky/-/husky-3.1.0.tgz"; - sha1 = "5faad520ab860582ed94f0c1a77f0f04c90b57c0"; + name = "husky___husky_4.3.8.tgz"; + url = "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz"; + sha1 = "31144060be963fd6850e5cc8f019a1dfe194296d"; }; } { @@ -1762,6 +1674,14 @@ }; } { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { name = "ignore___ignore_4.0.6.tgz"; path = fetchurl { name = "ignore___ignore_4.0.6.tgz"; @@ -1770,11 +1690,11 @@ }; } { - name = "ignore___ignore_5.1.4.tgz"; + name = "ignore___ignore_5.1.8.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; - sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; }; } { @@ -1842,19 +1762,27 @@ }; } { - name = "into_stream___into_stream_5.1.1.tgz"; + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "into_stream___into_stream_6.0.0.tgz"; path = fetchurl { - name = "into_stream___into_stream_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz"; - sha1 = "f9a20a348a11f3c13face22763f2d02e127f4db8"; + name = "into_stream___into_stream_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz"; + sha1 = "4bfc1244c0128224e18b8870e85b2de8e66c6702"; }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; }; } { @@ -1874,6 +1802,14 @@ }; } { + name = "is_core_module___is_core_module_2.3.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; + }; + } + { name = "is_directory___is_directory_0.3.1.tgz"; path = fetchurl { name = "is_directory___is_directory_0.3.1.tgz"; @@ -1954,19 +1890,19 @@ }; } { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_promise___is_promise_2.2.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; }; } { @@ -1994,14 +1930,6 @@ }; } { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - } - { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; @@ -2018,14 +1946,6 @@ }; } { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - } - { name = "js_tokens___js_tokens_4.0.0.tgz"; path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; @@ -2042,14 +1962,6 @@ }; } { - name = "jsbn___jsbn_0.1.1.tgz"; - path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - } - { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; path = fetchurl { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; @@ -2058,6 +1970,14 @@ }; } { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } + { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; @@ -2074,14 +1994,6 @@ }; } { - name = "json_schema___json_schema_0.2.3.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - } - { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; @@ -2090,35 +2002,19 @@ }; } { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; + name = "jsonfile___jsonfile_6.1.0.tgz"; path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; }; } { - name = "jsprim___jsprim_1.4.1.tgz"; + name = "kuler___kuler_2.0.0.tgz"; path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - } - { - name = "kuler___kuler_1.0.1.tgz"; - path = fetchurl { - name = "kuler___kuler_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz"; - sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6"; + name = "kuler___kuler_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz"; + sha1 = "e2c570a3800388fb44407e851531c1d670b061b3"; }; } { @@ -2186,11 +2082,11 @@ }; } { - name = "locate_path___locate_path_5.0.0.tgz"; + name = "locate_path___locate_path_6.0.0.tgz"; path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + name = "locate_path___locate_path_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; + sha1 = "55321eb309febbc59c4801d931a72452a681d286"; }; } { @@ -2202,19 +2098,35 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; } { - name = "lodash___lodash_4.17.19.tgz"; + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; - sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -2242,11 +2154,11 @@ }; } { - name = "logform___logform_2.1.2.tgz"; + name = "logform___logform_2.2.0.tgz"; path = fetchurl { - name = "logform___logform_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz"; - sha1 = "957155ebeb67a13164069825ce67ddb5bb2dd360"; + name = "logform___logform_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz"; + sha1 = "40f036d19161fc76b68ab50fdc7fe495544492f2"; }; } { @@ -2258,14 +2170,6 @@ }; } { - name = "lru_cache___lru_cache_4.1.5.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; - sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; - }; - } - { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; @@ -2306,11 +2210,11 @@ }; } { - name = "merge2___merge2_1.3.0.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; - sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -2322,27 +2226,27 @@ }; } { - name = "micromatch___micromatch_4.0.2.tgz"; + name = "micromatch___micromatch_4.0.4.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; }; } { - name = "mime_db___mime_db_1.43.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.43.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.26.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.26.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { @@ -2354,11 +2258,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -2378,19 +2282,19 @@ }; } { - name = "minimatch___minimatch_3.0.4.tgz"; + name = "mimic_response___mimic_response_2.1.0.tgz"; path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha1 = "d13763d35f613d09ec37ebb30bac0469c0ee8f43"; }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; }; } { @@ -2402,27 +2306,19 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - } - { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; }; } { - name = "morgan___morgan_1.9.1.tgz"; + name = "morgan___morgan_1.10.0.tgz"; path = fetchurl { - name = "morgan___morgan_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz"; - sha1 = "0a8d16734a1d9afbc824b99df87e738e58e2da59"; + name = "morgan___morgan_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; + sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; }; } { @@ -2458,19 +2354,19 @@ }; } { - name = "multistream___multistream_2.1.1.tgz"; + name = "multistream___multistream_4.1.0.tgz"; path = fetchurl { - name = "multistream___multistream_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz"; - sha1 = "629d3a29bd76623489980d04519a2c365948148c"; + name = "multistream___multistream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz"; + sha1 = "7bf00dfd119556fbc153cff3de4c6d477909f5a8"; }; } { - name = "mz___mz_2.7.0.tgz"; + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; path = fetchurl { - name = "mz___mz_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz"; - sha1 = "95008057a56cafadc2bc63dde7f9ff6955948e32"; + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha1 = "b1fddc0b2c46e380a0b7a76f984dd47c41a13806"; }; } { @@ -2490,11 +2386,11 @@ }; } { - name = "nice_try___nice_try_1.0.5.tgz"; + name = "node_abi___node_abi_2.26.0.tgz"; path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + name = "node_abi___node_abi_2.26.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz"; + sha1 = "355d5d4bc603e856f74197adbf3f5117a396ba40"; }; } { @@ -2506,11 +2402,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + name = "noop_logger___noop_logger_0.1.1.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + name = "noop_logger___noop_logger_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; } { @@ -2522,14 +2418,6 @@ }; } { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - } - { name = "npm_run_path___npm_run_path_3.1.0.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_3.1.0.tgz"; @@ -2538,19 +2426,19 @@ }; } { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; + name = "npmlog___npmlog_4.1.2.tgz"; path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; } { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; + name = "number_is_nan___number_is_nan_1.0.1.tgz"; path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; } { @@ -2586,11 +2474,11 @@ }; } { - name = "one_time___one_time_0.0.4.tgz"; + name = "one_time___one_time_1.0.0.tgz"; path = fetchurl { - name = "one_time___one_time_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + name = "one_time___one_time_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz"; + sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; }; } { @@ -2602,19 +2490,19 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { - name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; path = fetchurl { - name = "opencollective_postinstall___opencollective_postinstall_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz"; - sha1 = "5657f1bede69b6e33a45939b061eb53d3c6c3a89"; + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; }; } { @@ -2634,22 +2522,6 @@ }; } { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - path = fetchurl { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - } - { - name = "p_finally___p_finally_1.0.0.tgz"; - path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - } - { name = "p_finally___p_finally_2.0.1.tgz"; path = fetchurl { name = "p_finally___p_finally_2.0.1.tgz"; @@ -2666,19 +2538,19 @@ }; } { - name = "p_limit___p_limit_2.2.2.tgz"; + name = "p_limit___p_limit_3.1.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; }; } { - name = "p_locate___p_locate_4.1.0.tgz"; + name = "p_locate___p_locate_5.0.0.tgz"; path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + name = "p_locate___p_locate_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; + sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; }; } { @@ -2698,14 +2570,6 @@ }; } { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; - }; - } - { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; @@ -2722,11 +2586,11 @@ }; } { - name = "parse_json___parse_json_5.0.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -2754,14 +2618,6 @@ }; } { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - } - { name = "path_key___path_key_3.1.1.tgz"; path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; @@ -2810,51 +2666,35 @@ }; } { - name = "performance_now___performance_now_2.1.0.tgz"; - path = fetchurl { - name = "performance_now___performance_now_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - } - { - name = "picomatch___picomatch_2.2.1.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; - sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "pkg_dir___pkg_dir_5.0.0.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "pkg_dir___pkg_dir_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; + sha1 = "a02d6aebe6ba133a928f74aec20bafdfe6b8e760"; }; } { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; + name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; path = fetchurl { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + name = "pkg_fetch___pkg_fetch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.0.4.tgz"; + sha1 = "8321eff936bf4eb088a333cf23494be0ded173b7"; }; } { - name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; + name = "pkg___pkg_5.1.0.tgz"; path = fetchurl { - name = "pkg_fetch___pkg_fetch_2.6.8.tgz"; - url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-2.6.8.tgz"; - sha1 = "458ba6b9c936de1b0f3f9c830f389888561e630f"; - }; - } - { - name = "pkg___pkg_4.4.8.tgz"; - path = fetchurl { - name = "pkg___pkg_4.4.8.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-4.4.8.tgz"; - sha1 = "145fb81f31eebfb90d2010dd2c4b663ca0db4009"; + name = "pkg___pkg_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.1.0.tgz"; + sha1 = "25f92666a4164bbc5495c862de9370ed48788667"; }; } { @@ -2866,6 +2706,14 @@ }; } { + name = "prebuild_install___prebuild_install_6.0.1.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz"; + sha1 = "5902172f7a40eb67305b96c2a695db32636ee26d"; + }; + } + { name = "prelude_ls___prelude_ls_1.2.1.tgz"; path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; @@ -2914,27 +2762,27 @@ }; } { - name = "protobufjs___protobufjs_6.8.8.tgz"; + name = "protobufjs___protobufjs_6.11.2.tgz"; path = fetchurl { - name = "protobufjs___protobufjs_6.8.8.tgz"; - url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz"; - sha1 = "c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"; + name = "protobufjs___protobufjs_6.11.2.tgz"; + url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz"; + sha1 = "de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"; }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; }; } { @@ -2946,22 +2794,6 @@ }; } { - name = "pseudomap___pseudomap_1.0.2.tgz"; - path = fetchurl { - name = "pseudomap___pseudomap_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - } - { - name = "psl___psl_1.7.0.tgz"; - path = fetchurl { - name = "psl___psl_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; - }; - } - { name = "pump___pump_3.0.0.tgz"; path = fetchurl { name = "pump___pump_3.0.0.tgz"; @@ -2978,19 +2810,19 @@ }; } { - name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; + name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; path = fetchurl { - name = "puppeteer_cluster___puppeteer_cluster_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.18.0.tgz"; - sha1 = "189ef1cea474590aa4d42c9a665dc319689e8fad"; + name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz"; + sha1 = "4ab214671f414f15ad6a94a4b61ed0b4172e86e6"; }; } { - name = "puppeteer___puppeteer_2.0.0.tgz"; + name = "puppeteer___puppeteer_3.3.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.0.0.tgz"; - sha1 = "0612992e29ec418e0a62c8bebe61af1a64d7ec01"; + name = "puppeteer___puppeteer_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz"; + sha1 = "95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"; }; } { @@ -3002,11 +2834,11 @@ }; } { - name = "qs___qs_6.5.2.tgz"; + name = "queue_microtask___queue_microtask_1.2.3.tgz"; path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; }; } { @@ -3026,11 +2858,11 @@ }; } { - name = "read_pkg___read_pkg_5.2.0.tgz"; + name = "rc___rc_1.2.8.tgz"; path = fetchurl { - name = "read_pkg___read_pkg_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; }; } { @@ -3042,19 +2874,11 @@ }; } { - name = "readable_stream___readable_stream_3.5.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz"; - sha1 = "465d70e6d1087f6162d079cd0b5db7fbebfd1606"; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -3066,19 +2890,11 @@ }; } { - name = "request_progress___request_progress_3.0.0.tgz"; + name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { - name = "request_progress___request_progress_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz"; - sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } { @@ -3106,19 +2922,11 @@ }; } { - name = "resolve___resolve_1.14.2.tgz"; + name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.14.2.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz"; - sha1 = "dbf31d0fa98b1f29aa5169783b9c290cb865fea2"; - }; - } - { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; }; } { @@ -3138,22 +2946,6 @@ }; } { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; - }; - } - { - name = "rimraf___rimraf_3.0.0.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz"; - sha1 = "614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"; - }; - } - { name = "rimraf___rimraf_3.0.2.tgz"; path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; @@ -3162,27 +2954,19 @@ }; } { - name = "run_node___run_node_1.0.0.tgz"; - path = fetchurl { - name = "run_node___run_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz"; - sha1 = "46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"; - }; - } - { - name = "run_parallel___run_parallel_1.1.9.tgz"; + name = "run_parallel___run_parallel_1.2.0.tgz"; path = fetchurl { - name = "run_parallel___run_parallel_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz"; - sha1 = "c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"; + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; }; } { - name = "rxjs___rxjs_6.5.4.tgz"; + name = "rxjs___rxjs_6.6.7.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; - sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; }; } { @@ -3194,11 +2978,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -3218,27 +3002,27 @@ }; } { - name = "semver___semver_5.7.1.tgz"; + name = "semver_regex___semver_regex_3.1.2.tgz"; path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + name = "semver_regex___semver_regex_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz"; + sha1 = "34b4c0d361eef262e07199dbef316d0f2ab11807"; }; } { - name = "semver___semver_6.3.0.tgz"; + name = "semver___semver_5.7.1.tgz"; path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } { - name = "semver___semver_7.3.4.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -3258,19 +3042,19 @@ }; } { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; + name = "set_blocking___set_blocking_2.0.0.tgz"; path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; } { - name = "shebang_command___shebang_command_1.2.0.tgz"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; }; } { @@ -3282,14 +3066,6 @@ }; } { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - } - { name = "shebang_regex___shebang_regex_3.0.0.tgz"; path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; @@ -3298,11 +3074,27 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_concat___simple_concat_1.0.1.tgz"; + path = fetchurl { + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha1 = "f46976082ba35c2263f1c8ab5edfe26c41c9552f"; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha1 = "b45be062435e50d159540b576202ceec40b9c6b3"; }; } { @@ -3346,38 +3138,6 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; - }; - } - { name = "split___split_0.3.3.tgz"; path = fetchurl { name = "split___split_0.3.3.tgz"; @@ -3394,14 +3154,6 @@ }; } { - name = "sshpk___sshpk_1.16.1.tgz"; - path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; - }; - } - { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { name = "stack_trace___stack_trace_0.0.10.tgz"; @@ -3466,11 +3218,11 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { @@ -3522,14 +3274,6 @@ }; } { - name = "strip_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - } - { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; path = fetchurl { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; @@ -3546,6 +3290,14 @@ }; } { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { name = "supports_color___supports_color_2.0.0.tgz"; @@ -3578,11 +3330,27 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.6.0.tgz"; + path = fetchurl { + name = "table___table_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; + sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; + }; + } + { + name = "tar_fs___tar_fs_2.1.1.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; + sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + }; + } + { + name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "tar_stream___tar_stream_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; + sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } { @@ -3610,30 +3378,6 @@ }; } { - name = "thenify_all___thenify_all_1.6.0.tgz"; - path = fetchurl { - name = "thenify_all___thenify_all_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; - }; - } - { - name = "thenify___thenify_3.3.0.tgz"; - path = fetchurl { - name = "thenify___thenify_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; - }; - } - { - name = "throttleit___throttleit_1.0.0.tgz"; - path = fetchurl { - name = "throttleit___throttleit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - } - { name = "through___through_2.3.8.tgz"; path = fetchurl { name = "through___through_2.3.8.tgz"; @@ -3642,6 +3386,14 @@ }; } { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { name = "to_regex_range___to_regex_range_5.0.1.tgz"; path = fetchurl { name = "to_regex_range___to_regex_range_5.0.1.tgz"; @@ -3658,14 +3410,6 @@ }; } { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; - }; - } - { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; @@ -3674,35 +3418,35 @@ }; } { - name = "tsc_watch___tsc_watch_4.2.3.tgz"; + name = "tsc_watch___tsc_watch_4.2.9.tgz"; path = fetchurl { - name = "tsc_watch___tsc_watch_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.3.tgz"; - sha1 = "630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b"; + name = "tsc_watch___tsc_watch_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.2.9.tgz"; + sha1 = "d93fc74233ca4ef7ee6b12d08c0fe6aca3e19044"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_2.1.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; + sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; }; } { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + name = "tslib___tslib_1.14.1.tgz"; path = fetchurl { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; } { @@ -3722,11 +3466,11 @@ }; } { - name = "type_fest___type_fest_0.6.0.tgz"; + name = "type_fest___type_fest_0.20.2.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; }; } { @@ -3746,27 +3490,19 @@ }; } { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - } - { - name = "typescript___typescript_3.8.3.tgz"; + name = "typescript___typescript_3.9.9.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + name = "typescript___typescript_3.9.9.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz"; + sha1 = "e69905c54bc0681d0518bd4d587cc6f2d0b1a674"; }; } { - name = "uid2___uid2_0.0.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "uid2___uid2_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; - sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; }; } { @@ -3786,19 +3522,11 @@ }; } { - name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; + name = "universalify___universalify_2.0.0.tgz"; path = fetchurl { - name = "unique_temp_dir___unique_temp_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-temp-dir/-/unique-temp-dir-1.0.0.tgz"; - sha1 = "6dce95b2681ca003eebfb304a415f9cbabcc5385"; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; }; } { @@ -3818,11 +3546,11 @@ }; } { - name = "url_value_parser___url_value_parser_2.0.1.tgz"; + name = "url_value_parser___url_value_parser_2.0.3.tgz"; path = fetchurl { - name = "url_value_parser___url_value_parser_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.1.tgz"; - sha1 = "c8179a095ab9ec1f5aa17ca36af5af396b4e95ed"; + name = "url_value_parser___url_value_parser_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz"; + sha1 = "cd4b8d6754e458d65e8125260c09718d926e6e21"; }; } { @@ -3842,27 +3570,11 @@ }; } { - name = "uuid___uuid_3.4.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; - }; - } - { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { @@ -3874,19 +3586,11 @@ }; } { - name = "verror___verror_1.10.0.tgz"; - path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - } - { - name = "which___which_1.3.1.tgz"; + name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; }; } { @@ -3898,19 +3602,27 @@ }; } { - name = "winston_transport___winston_transport_4.3.0.tgz"; + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "winston_transport___winston_transport_4.4.0.tgz"; path = fetchurl { - name = "winston_transport___winston_transport_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz"; - sha1 = "df68c0c202482c448d9b47313c07304c2d7c2c66"; + name = "winston_transport___winston_transport_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz"; + sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59"; }; } { - name = "winston___winston_3.2.1.tgz"; + name = "winston___winston_3.3.3.tgz"; path = fetchurl { - name = "winston___winston_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz"; - sha1 = "63061377976c73584028be2490a1846055f77f07"; + name = "winston___winston_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz"; + sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170"; }; } { @@ -3930,6 +3642,14 @@ }; } { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; @@ -3938,19 +3658,19 @@ }; } { - name = "ws___ws_6.2.1.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; - sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { - name = "yallist___yallist_2.1.2.tgz"; + name = "y18n___y18n_5.0.8.tgz"; path = fetchurl { - name = "yallist___yallist_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; }; } { @@ -3962,11 +3682,43 @@ }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; }; } ]; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix new file mode 100644 index 00000000000..e3ea1a80251 --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -0,0 +1,101 @@ +{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd +, boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib +# Databases +, withMysql ? true, withPostgresql ? false +# Features +, withChecker ? true, withCompat ? false, withLivestatus ? false +, withNotification ? true, withPerfdata ? true, withIcingadb ? true +, nameSuffix ? "" }: + +stdenv.mkDerivation rec { + pname = "icinga2${nameSuffix}"; + version = "2.12.3"; + + src = fetchFromGitHub { + owner = "icinga"; + repo = "icinga2"; + rev = "v${version}"; + sha256 = "0pq6ixv7d9bqys8qjxqq0jki3zncj8jdfavkp7qw125iyfjq48xk"; + }; + + patches = [ + ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path + ./no-systemd-service.patch # Prevent systemd service from being written to /usr + ./no-var-directories.patch # Prevent /var directories from being created + ]; + + cmakeFlags = let + mkFeatureFlag = label: value: "-DICINGA2_WITH_${label}=${if value then "ON" else "OFF"}"; + in [ + # Paths + "-DCMAKE_INSTALL_SYSCONFDIR=etc" + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DCMAKE_INSTALL_FULL_SBINDIR=bin" + "-DICINGA2_RUNDIR=/run" + "-DMYSQL_INCLUDE_DIR=${mariadb-connector-c.dev}/include/mariadb" + "-DMYSQL_LIB=${mariadb-connector-c.out}/lib/mariadb/libmysqlclient.a" + "-DICINGA2_PLUGINDIR=bin" + "-DICINGA2_UNITY_BUILD=no" + # Features + (mkFeatureFlag "MYSQL" withMysql) + (mkFeatureFlag "PGSQL" withPostgresql) + (mkFeatureFlag "CHECKER" withChecker) + (mkFeatureFlag "COMPAT" withCompat) + (mkFeatureFlag "LIVESTATUS" withLivestatus) + (mkFeatureFlag "NOTIFICATION" withNotification) + (mkFeatureFlag "PERFDATA" withPerfdata) + (mkFeatureFlag "ICINGADB" withIcingadb) + # Misc. + "-DICINGA2_USER=icinga2" + "-DICINGA2_GROUP=icinga2" + "-DICINGA2_GIT_VERSION_INFO=OFF" + "-DICINGA2_WITH_TESTS=OFF" + "-DUSE_SYSTEMD=ON" + ]; + + buildInputs = [ boost openssl systemd ] + ++ lib.optional withPostgresql postgresql; + + nativeBuildInputs = [ cmake flex bison patchelf ]; + + postFixup = '' + rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs + + # Fix hardcoded paths + sed -i 's:/usr/bin/::g' $out/etc/icinga2/scripts/* + + # Cleanup sbin + sed -i 's/sbin/bin/g' $out/lib/icinga2/safe-reload + rm $out/sbin + + ${lib.optionalString withMysql '' + # Add dependencies of the MySQL shim to the shared library + patchelf --add-needed ${zlib.out}/lib/libz.so $(readlink -f $out/lib/icinga2/libmysql_shim.so) + + # Make Icinga find the MySQL shim + icinga2Bin=$out/lib/icinga2/sbin/icinga2 + patchelf --set-rpath $out/lib/icinga2:$(patchelf --print-rpath $icinga2Bin) $icinga2Bin + ''} + ''; + + vim = stdenv.mkDerivation { + pname = "vim-icinga2"; + inherit version src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/vim-plugins + cp -r tools/syntax/vim $out/share/vim-plugins/icinga2 + ''; + }; + + meta = { + description = "Open source monitoring system"; + homepage = "https://www.icinga.com"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ das_j ]; + }; +} diff --git a/pkgs/servers/monitoring/icinga2/etc-icinga2.patch b/pkgs/servers/monitoring/icinga2/etc-icinga2.patch new file mode 100644 index 00000000000..a08f7ba979c --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/etc-icinga2.patch @@ -0,0 +1,13 @@ +diff --git a/config.h.cmake b/config.h.cmake +index 16fa190..152bf43 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -13,7 +13,7 @@ + + #cmakedefine ICINGA2_UNITY_BUILD + +-#define ICINGA_CONFIGDIR "${ICINGA2_FULL_CONFIGDIR}" ++#define ICINGA_CONFIGDIR "/etc/icinga2" + #define ICINGA_DATADIR "${ICINGA2_FULL_DATADIR}" + #define ICINGA_LOGDIR "${ICINGA2_FULL_LOGDIR}" + #define ICINGA_CACHEDIR "${ICINGA2_FULL_CACHEDIR}" diff --git a/pkgs/servers/monitoring/icinga2/no-systemd-service.patch b/pkgs/servers/monitoring/icinga2/no-systemd-service.patch new file mode 100644 index 00000000000..a032a90647d --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/no-systemd-service.patch @@ -0,0 +1,15 @@ +diff --git a/etc/initsystem/CMakeLists.txt b/etc/initsystem/CMakeLists.txt +index e702c83..c23cabb 100644 +--- a/etc/initsystem/CMakeLists.txt ++++ b/etc/initsystem/CMakeLists.txt +@@ -50,10 +50,5 @@ if(NOT WIN32) + + if (USE_SYSTEMD OR INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT) + configure_file(icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service @ONLY) +- install( +- FILES ${CMAKE_CURRENT_BINARY_DIR}/initsystem/icinga2.service +- DESTINATION ${DESTDIR}/usr/lib/systemd/system +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) + endif() + endif() diff --git a/pkgs/servers/monitoring/icinga2/no-var-directories.patch b/pkgs/servers/monitoring/icinga2/no-var-directories.patch new file mode 100644 index 00000000000..3a1d4805585 --- /dev/null +++ b/pkgs/servers/monitoring/icinga2/no-var-directories.patch @@ -0,0 +1,66 @@ +diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt +index 87993df..819c87b 100644 +--- a/icinga-app/CMakeLists.txt ++++ b/icinga-app/CMakeLists.txt +@@ -106,7 +106,3 @@ install( + TARGETS icinga-app + RUNTIME DESTINATION ${InstallPath} + ) +- +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}\")") +diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt +index 5dda179..22cf69f 100644 +--- a/lib/base/CMakeLists.txt ++++ b/lib/base/CMakeLists.txt +@@ -125,7 +125,4 @@ set_target_properties ( + FOLDER Lib + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CACHEDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/crash\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/perfdata/CMakeLists.txt b/lib/perfdata/CMakeLists.txt +index ab963f7..3d9d506 100644 +--- a/lib/perfdata/CMakeLists.txt ++++ b/lib/perfdata/CMakeLists.txt +@@ -74,7 +74,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/perfdata\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}/tmp\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) +diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt +index 65113d2..5e4398f 100644 +--- a/lib/remote/CMakeLists.txt ++++ b/lib/remote/CMakeLists.txt +@@ -55,12 +55,3 @@ set_target_properties ( + remote PROPERTIES + FOLDER Lib + ) +- +-#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/log\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/api/zones-stage\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certs\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_DATADIR}/certificate-requests\")") +- +- +diff --git a/lib/compat/CMakeLists.txt b/lib/compat/CMakeLists.txt +index 1438626..d882ae2 100644 +--- a/lib/compat/CMakeLists.txt ++++ b/lib/compat/CMakeLists.txt +@@ -55,8 +55,4 @@ install_if_not_exists( + ${ICINGA2_CONFIGDIR}/features-available + ) + +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_LOGDIR}/compat/archives\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_SPOOLDIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_INITRUNDIR}/cmd\")") +- + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index b9f5ad1be24..64698415e50 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v50 = generic { - version = "5.0.10"; - sha256 = "15kbbj1vclsys1z3ghcz9j5faz67k3z8yl81bn7bhmqaflavgicb"; + version = "5.0.11"; + sha256 = "0xrh0l8wr0q903a1swz9anvzkb5hlbl2win5xns55cmbw0ygbwfa"; }; v40 = generic { diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index b1a11db0fb6..0e1d933ab58 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,19 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper -, which, nodejs, mkYarnPackage, python2, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, makeWrapper +, which +, nodejs +, mkYarnPackage +, python2 +, nixosTests +, buildGoModule +}: + +let + # we need a different version than the one already available in nixpkgs + esbuild-hedgedoc = buildGoModule rec { + pname = "esbuild"; + version = "0.11.20"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "009f2mfgzkzgxjh3034mzdkcvm5vz17sgy1cs604f0425i22z8qm"; + }; + + vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + }; +in mkYarnPackage rec { name = "hedgedoc"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "1xi4gi1yjwggdsnz5hljx9xl4qhnm9r3c24q7i6d5y8yv6lh6lsr"; + sha256 = "1h2wyhap264iqm2jh0i05w0hb2j86jsq1plyl7k3an90w7wngyg1"; }; nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python2 ]; + extraBuildInputs = [ python2 esbuild-hedgedoc ]; yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; @@ -35,6 +62,11 @@ mkYarnPackage rec { npm run install --build-from-source --nodedir=${nodejs}/include/node popd + pushd node_modules/esbuild + rm bin/esbuild + ln -s ${lib.getBin esbuild-hedgedoc}/bin/esbuild bin/ + popd + npm run build patchShebangs bin/* diff --git a/pkgs/servers/web-apps/hedgedoc/package.json b/pkgs/servers/web-apps/hedgedoc/package.json index 63dfc6cb591..c7fb794a1b7 100644 --- a/pkgs/servers/web-apps/hedgedoc/package.json +++ b/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.8.0", + "version": "1.8.2", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -25,11 +25,8 @@ "azure-storage": "^2.7.0", "base64url": "^3.0.0", "body-parser": "^1.15.2", - "bootstrap": "^3.4.0", - "bootstrap-validator": "^0.11.8", "chance": "^1.0.4", "cheerio": "^0.22.0", - "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^7.0.0", @@ -38,32 +35,16 @@ "deep-freeze": "^0.0.1", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "ejs": "^3.0.0", - "emojify.js": "^1.1.0", - "escape-html": "^1.0.3", "express": ">=4.14", "express-session": "^1.14.2", - "file-saver": "^2.0.0", "file-type": "^16.1.0", - "flowchart.js": "^1.6.4", - "fork-awesome": "^1.1.3", "formidable": "^1.0.17", - "gist-embed": "^2.6.0", "graceful-fs": "^4.1.11", "handlebars": "^4.5.2", "helmet": "^4.5.0", - "highlight.js": "^10.0.0", "i18n": "^0.13.0", - "ionicons": "^2.0.1", "is-svg": "^4.3.1", - "jquery": "^3.5.1", - "jquery-mousewheel": "^3.1.13", - "jquery-ui": "^1.12.1", - "js-cookie": "^2.1.3", - "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", - "js-yaml": "^3.13.1", "jsdom-nogyp": "^0.8.3", - "keymaster": "^1.6.2", - "list.js": "^2.0.0", "lodash": "^4.17.20", "lutim": "^1.0.2", "lz-string": "git+https://github.com/hackmdio/lz-string.git", @@ -81,9 +62,7 @@ "markdown-it-regexp": "^0.4.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "mathjax": "^2.7.6", "mattermost": "^3.4.0", - "mermaid": "^8.5.1", "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^3.0.0", "minimist": "^1.2.0", @@ -107,36 +86,25 @@ "pdfobject": "^2.0.201604172", "pg": "^8.2.1", "pg-hstore": "^2.3.3", - "prismjs": "^1.21.0", "prom-client": "^13.1.0", "prometheus-api-metrics": "^3.2.0", "randomcolor": "^0.6.0", - "raphael": "^2.3.0", "readline-sync": "^1.4.7", - "reveal.js": "^3.9.2", "rimraf": "^3.0.2", "scrypt-kdf": "^2.0.1", - "select2": "^3.5.2-browserify", "sequelize": "^5.21.1", "shortid": "2.2.16", "socket.io": "^2.1.1", - "socket.io-client": "^2.1.1", - "spin.js": "^4.0.0", "sqlite3": "^5.0.0", "store": "^2.0.12", "string": "^3.3.3", "tedious": "^6.6.0", "toobusy-js": "^0.5.1", - "turndown": "^7.0.0", "umzug": "^2.3.0", "uuid": "^8.0.0", "validator": "^13.0.0", - "velocity-animate": "^1.4.0", - "visibilityjs": "^2.0.0", - "viz.js": "^1.7.0", "winston": "^3.1.0", "ws": "^7.4.4", - "wurl": "^2.5.3", "xss": "^1.0.3" }, "resolutions": { @@ -163,6 +131,10 @@ "name": "Christoph (Sheogorath) Kern", "email": "codimd@sheogorath.shivering-isles.com", "url": "https://shivering-isles.com" + }, + { + "name":"David Mehren", + "email": "hedgedoc@herrmehren.de" } ], "repository": { @@ -177,9 +149,15 @@ "babel-polyfill": "6.26.0", "babel-preset-env": "1.7.0", "babel-runtime": "6.26.0", + "bootstrap": "3.4.1", + "bootstrap-validator": "0.11.9", + "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "copy-webpack-plugin": "6.4.1", "css-loader": "5.2.4", - "eslint": "7.25.0", + "emojify.js": "1.1.0", + "esbuild-loader": "2.13.0", + "escape-html": "1.0.3", + "eslint": "7.26.0", "eslint-config-standard": "16.0.2", "eslint-plugin-import": "2.22.1", "eslint-plugin-node": "11.1.0", @@ -187,23 +165,50 @@ "eslint-plugin-standard": "4.1.0", "expose-loader": "1.0.3", "file-loader": "6.2.0", + "file-saver": "2.0.5", + "flowchart.js": "1.15.0", + "fork-awesome": "1.1.7", + "gist-embed": "2.6.0", + "highlight.js": "10.7.2", "html-webpack-plugin": "4.5.2", "imports-loader": "1.2.0", + "ionicons": "2.0.1", + "jquery": "3.6.0", + "jquery-mousewheel": "3.1.13", + "jquery-ui": "1.12.1", + "js-cookie": "2.2.1", + "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", + "js-yaml": "3.14.1", "jsonlint": "1.6.3", + "keymaster": "1.6.2", "less": "4.1.1", "less-loader": "7.3.0", + "list.js": "2.3.1", + "mathjax": "2.7.9", + "mermaid": "8.10.1", "mini-css-extract-plugin": "1.6.0", - "mocha": "8.3.2", + "mocha": "8.4.0", "mock-require": "3.0.3", "optimize-css-assets-webpack-plugin": "5.0.4", + "prismjs": "1.23.0", + "raphael": "2.3.0", "remark-cli": "9.0.0", "remark-preset-lint-markdown-style-guide": "4.0.0", + "reveal.js": "3.9.2", "script-loader": "0.7.2", + "select2": "3.5.2-browserify", + "socket.io-client": "2.4.0", + "spin.js": "4.1.0", "string-loader": "0.0.1", + "turndown": "7.0.0", "url-loader": "4.1.1", + "velocity-animate": "1.5.2", + "visibilityjs": "2.0.2", + "viz.js": "1.8.2", "webpack": "4.46.0", - "webpack-cli": "4.6.0", - "webpack-merge": "5.7.3" + "webpack-cli": "4.7.0", + "webpack-merge": "5.7.3", + "wurl": "2.5.4" }, "optionalDependencies": { "bufferutil": "^4.0.0", diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.lock b/pkgs/servers/web-apps/hedgedoc/yarn.lock index e7c464b5b8a..a404d95d8f4 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ b/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -92,10 +92,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@eslint/eslintrc@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" + integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -296,19 +296,19 @@ integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== "@types/node@*": - version "15.0.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" - integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== "@types/node@^12.12.17": - version "12.20.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz#980832cd56efafff8c18aa148c4085eb02a483f4" - integrity sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ== + version "12.20.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226" + integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg== "@types/node@^14.14.28": - version "14.14.43" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8" - integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ== + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/node@^8.0.47": version "8.10.66" @@ -378,9 +378,9 @@ source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.27" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc" - integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA== + version "4.41.28" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b" + integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ== dependencies: "@types/anymatch" "*" "@types/node" "*" @@ -539,22 +539,22 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" - integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== +"@webpack-cli/configtest@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" + integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== -"@webpack-cli/info@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" - integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== +"@webpack-cli/info@^1.2.4": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" + integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" - integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== +"@webpack-cli/serve@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" + integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -658,9 +658,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== + version "8.3.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c" + integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -949,9 +949,9 @@ available-typed-arrays@^1.0.2: array-filter "^1.0.0" aws-sdk@^2.888.0: - version "2.898.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz#fd07b9748d302fccc2d1e069ae313e911b526578" - integrity sha512-6XxsKEDgDEQlLAVrPDNO01UgflCaKJlp6bYTSxv2z50ApTktadwSr/uJgpaBdAiZ8EKVlWN4UgM7vgOmrI/MPg== + version "2.904.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz#45a53e918698e451f762e44005dfce177a50b7e6" + integrity sha512-BnlMgxiQ0as0LSigm/QVgdh8CoIVY29DItmnFOnL6ahJ5W/m1Xzpge2jJoj+gqwZ+QQvOO31dDYw9PtteiR/IQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1727,12 +1727,12 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -bootstrap-validator@^0.11.8: +bootstrap-validator@0.11.9: version "0.11.9" resolved "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz#fb7058eef53623e78f5aa7967026f98f875a9404" integrity sha1-+3BY7vU2I+ePWqeWcCb5j4dalAQ= -bootstrap@^3.4.0: +bootstrap@3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== @@ -2064,9 +2064,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001219: - version "1.0.30001220" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36" - integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA== + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== caseless@~0.12.0: version "0.12.0" @@ -3505,9 +3505,9 @@ ejs@^3.0.0: jake "^10.6.1" electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.723: - version "1.3.725" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" - integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== elliptic@^6.5.3: version "6.5.4" @@ -3527,7 +3527,7 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojify.js@^1.1.0: +emojify.js@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s= @@ -3555,9 +3555,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: once "^1.4.0" engine.io-client@~3.5.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9" - integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ== + version "3.5.2" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa" + integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA== dependencies: component-emitter "~1.3.0" component-inherit "0.0.3" @@ -3568,7 +3568,7 @@ engine.io-client@~3.5.0: parseqs "0.0.6" parseuri "0.0.6" ws "~7.4.2" - xmlhttprequest-ssl "~1.5.4" + xmlhttprequest-ssl "~1.6.2" yeast "0.1.2" engine.io-parser@~2.2.0: @@ -3603,7 +3603,7 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -3701,12 +3701,29 @@ es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== +esbuild-loader@2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz#f5a3602a89a3b728506ae3e1887304fffeef9270" + integrity sha512-gC9lML8RGkTSWG2pJVEOZRLMoIluq1Jd7OzzVkOZKMzbMDMWDhXEwXLs60n+aglnAYa9GVrD/UXjTHkM51nBsg== + dependencies: + esbuild "^0.11.19" + joycon "^3.0.1" + json5 "^2.2.0" + loader-utils "^2.0.0" + type-fest "^1.0.1" + webpack-sources "^2.2.0" + +esbuild@^0.11.19: + version "0.11.20" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz#7cefa1aee8b372c184e42457885f7ce5d3e62a1e" + integrity sha512-QOZrVpN/Yz74xfat0H6euSgn3RnwLevY1mJTEXneukz1ln9qB+ieaerRMzSeETpz/UJWsBMzRVR/andBht5WKw== + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@^1.0.3, escape-html@~1.0.3: +escape-html@1.0.3, escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= @@ -3820,17 +3837,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.25.0: - version "7.25.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" - integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== +eslint@7.26.0: + version "7.26.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" + integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" + "@eslint/eslintrc" "^0.4.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -4192,15 +4209,15 @@ file-loader@6.2.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -file-saver@^2.0.0: +file-saver@2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== file-type@^16.1.0: - version "16.3.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz#f03af91db30f92cc9a0b335c0644c46101522f6d" - integrity sha512-ZA0hV64611vJT42ltw0T9IDwHApQuxRdrmQZWTeDmeAUtZBBVSQW3nSQqhhW1cAgpXgqcJvm410BYHXJQ9AymA== + version "16.4.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz#464197e44bd94a452d77b09085d977ae0dad2df4" + integrity sha512-MDAkwha3wHg11Lp++2T3Gu347eC/DB4r7nYj6iZaf1l7UhGBh2746QKxg0BWC8w2dJsxUEmH8KvLueX+GthN2w== dependencies: readable-web-to-node-stream "^3.0.0" strtok3 "^6.0.3" @@ -4340,7 +4357,7 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -flowchart.js@^1.6.4: +flowchart.js@1.15.0: version "1.15.0" resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f" integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ== @@ -4361,9 +4378,9 @@ fn.name@1.x.x: integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== follow-redirects@^1.10.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" - integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4387,7 +4404,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-awesome@^1.1.3: +fork-awesome@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21" integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g== @@ -4588,7 +4605,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gist-embed@^2.6.0: +gist-embed@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab" integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas= @@ -4623,7 +4640,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4635,6 +4652,18 @@ glob@7.1.6, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^12.1.0: version "12.4.0" resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" @@ -4834,7 +4863,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^10.0.0: +highlight.js@10.7.2: version "10.7.2" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360" integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg== @@ -4966,9 +4995,9 @@ human-signals@^2.1.0: integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== i18n@^0.13.0: - version "0.13.2" - resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz#3886678fe7cbbed45bac2ce53b8144c788a1c1b5" - integrity sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw== + version "0.13.3" + resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz#5820f48d87a77cf14e064719bee9bc682ed550eb" + integrity sha512-QDmY2joBdKxj3wvk2LKyvZkjwGHta882kYHwEvx1WbwiPAet49kEU7cxzGfnrtWrfh4+7I07kBc0ZSjSlhnKyQ== dependencies: debug "^4.1.1" make-plural "^6.2.2" @@ -5019,9 +5048,9 @@ iferr@^0.1.5: integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== dependencies: minimatch "^3.0.4" @@ -5144,7 +5173,7 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -ionicons@^2.0.1: +ionicons@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e" integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4= @@ -5204,9 +5233,9 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== is-binary-path@^1.0.0: version "1.0.1" @@ -5228,11 +5257,11 @@ is-bluebird@^1.0.2: integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-buffer@^1.1.5: version "1.1.6" @@ -5262,9 +5291,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" + integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== dependencies: has "^1.0.3" @@ -5283,9 +5312,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1, is-date-object@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== is-decimal@^1.0.0: version "1.0.4" @@ -5413,9 +5442,9 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== is-number@^2.1.0: version "2.1.0" @@ -5474,12 +5503,12 @@ is-property@^1.0.2: integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= is-regex@^1.1.1, is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-resolvable@^1.0.0: version "1.1.0" @@ -5497,9 +5526,9 @@ is-stream@^2.0.0: integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== is-svg@^4.3.1: version "4.3.1" @@ -5509,11 +5538,11 @@ is-svg@^4.3.1: fast-xml-parser "^3.19.0" is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-typed-array@^1.1.3: version "1.1.5" @@ -5613,22 +5642,27 @@ jmespath@0.15.0: resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= -jquery-mousewheel@^3.1.13: +joycon@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf" + integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA== + +jquery-mousewheel@3.1.13: version "3.1.13" resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5" integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU= -jquery-ui@^1.12.1: +jquery-ui@1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= -jquery@^3.5.1: +jquery@3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== -js-cookie@^2.1.3: +js-cookie@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== @@ -5654,14 +5688,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -js-yaml@^3.13.1, js-yaml@^3.6.1: +js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.6.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -5669,6 +5696,13 @@ js-yaml@^3.13.1, js-yaml@^3.6.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + js-yaml@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -5767,7 +5801,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.0.0, json5@^2.1.2: +json5@^2.0.0, json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -5814,7 +5848,7 @@ jws@3.x.x: jwa "^1.4.1" safe-buffer "^5.0.1" -keymaster@^1.6.2: +keymaster@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb" integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= @@ -5959,7 +5993,7 @@ linkify-it@^3.0.1: dependencies: uc.micro "^1.0.1" -list.js@^2.0.0: +list.js@2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/list.js/-/list.js-2.3.1.tgz#48961989ffe52b0505e352f7a521f819f51df7e7" integrity sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg== @@ -6374,7 +6408,7 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -mathjax@^2.7.6: +mathjax@2.7.9: version "2.7.9" resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d" integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ== @@ -6497,10 +6531,10 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@^8.5.1: - version "8.9.3" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz#24f682d26f757ed4cb5812b0a798eddcedcc9658" - integrity sha512-RH8B4+HEKmdpwDieh3hpKS4oUcpfcu8q4hr3nub7Y7okxOLhF9ynEvKKQ7Dx6H1ymNjTLYUHei5/4gTnaPyimA== +mermaid@8.10.1: + version "8.10.1" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz#9573f702024e2173f4aa07d9b207d750507cf838" + integrity sha512-KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A== dependencies: "@braintree/sanitize-url" "^3.1.0" d3 "^5.7.0" @@ -6794,10 +6828,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" - integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== +mocha@8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" + integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" @@ -6934,10 +6968,10 @@ nanoid@^2.1.0: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -nanoid@^3.1.22: - version "3.1.22" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" - integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== +nanoid@^3.1.23: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== nanomatch@^1.2.9: version "1.2.13" @@ -7218,9 +7252,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.9.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" - integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== + version "1.10.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" + integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== object-is@^1.1.4: version "1.1.5" @@ -8171,9 +8205,9 @@ postcss-selector-parser@^3.0.0: uniq "^1.0.1" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.5" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4" - integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg== + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -8216,12 +8250,12 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: supports-color "^6.1.0" postcss@^8.2.10: - version "8.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" - integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== + version "8.2.15" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" + integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== dependencies: colorette "^1.2.2" - nanoid "^3.1.22" + nanoid "^3.1.23" source-map "^0.6.1" postgres-array@~2.0.0: @@ -8274,7 +8308,7 @@ printj@~1.1.0: resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== -prismjs@^1.21.0: +prismjs@1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== @@ -8479,7 +8513,7 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raphael@2.3.0, raphael@2.3.x, raphael@^2.3.0: +raphael@2.3.0, raphael@2.3.x: version "2.3.0" resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89" integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ== @@ -9346,7 +9380,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -reveal.js@^3.9.2: +reveal.js@3.9.2: version "3.9.2" resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358" integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA== @@ -9474,7 +9508,7 @@ scrypt-kdf@^2.0.1: resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6" integrity sha512-dMhpgBVJPDWZP5erOCwTjI6oAO9hKhFAjZsdSQ0spaWJYHuA/wFNF2weQQfsyCIk8eNKoLfEDxr3zAtM+gZo0Q== -select2@^3.5.2-browserify: +select2@3.5.2-browserify: version "3.5.2-browserify" resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" integrity sha1-3E2v2jjWenNOipekbw01Ka4FOR0= @@ -9736,7 +9770,7 @@ socket.io-adapter@~1.1.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.4.0, socket.io-client@^2.1.1: +socket.io-client@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== @@ -9783,7 +9817,7 @@ socket.io@^2.1.1: socket.io-client "2.4.0" socket.io-parser "~3.4.0" -source-list-map@^2.0.0: +source-list-map@^2.0.0, source-list-map@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== @@ -9860,7 +9894,7 @@ spdx-license-ids@^3.0.0: resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== -spin.js@^4.0.0: +spin.js@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555" integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA== @@ -10213,13 +10247,12 @@ svgo@^1.0.0: util.promisify "~1.0.0" table@^6.0.4: - version "6.6.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" - integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== + version "6.7.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2" + integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" - lodash.flatten "^4.4.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" @@ -10514,7 +10547,7 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -turndown@^7.0.0: +turndown@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.0.0.tgz#19b2a6a2d1d700387a1e07665414e4af4fec5225" integrity sha512-G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q== @@ -10543,6 +10576,11 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz#210251e7f57357a1457269e6b34837fed067ac2c" + integrity sha512-RPDKc5KrIyKTP7Fk75LruUagqG6b+OTgXlCR2Z0aQDJFeIvL4/mhahSEtHmmVzXu4gmA0srkF/8FCH3WOWxTWA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -10569,9 +10607,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.13.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113" - integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw== + version "3.13.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz#6815ac7fdd155d03c83e2362bb717e5b39b74013" + integrity sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA== uid-safe@~2.1.5: version "2.1.5" @@ -10957,7 +10995,7 @@ vasync@^2.2.0: dependencies: verror "1.10.0" -velocity-animate@^1.4.0: +velocity-animate@1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105" integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg== @@ -11021,12 +11059,12 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" -visibilityjs@^2.0.0: +visibilityjs@2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f" integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw== -viz.js@^1.7.0: +viz.js@1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a" integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ== @@ -11059,18 +11097,17 @@ webfontloader@~1.6.x: resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64= -webpack-cli@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" - integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== +webpack-cli@4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" + integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.2" - "@webpack-cli/info" "^1.2.3" - "@webpack-cli/serve" "^1.3.1" + "@webpack-cli/configtest" "^1.0.3" + "@webpack-cli/info" "^1.2.4" + "@webpack-cli/serve" "^1.4.0" colorette "^1.2.1" commander "^7.0.0" - enquirer "^2.3.6" execa "^5.0.0" fastest-levenshtein "^1.0.12" import-local "^3.0.2" @@ -11095,6 +11132,14 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-list-map "^2.0.0" source-map "~0.6.1" +webpack-sources@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" + integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== + dependencies: + source-list-map "^2.0.1" + source-map "^0.6.1" + webpack@4.46.0: version "4.46.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" @@ -11263,7 +11308,7 @@ ws@^7.4.4, ws@~7.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== -wurl@^2.5.3: +wurl@2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec" integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ== @@ -11344,10 +11389,10 @@ xmldom@0.5.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== -xmlhttprequest-ssl@~1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" - integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= +xmlhttprequest-ssl@~1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz#dd6899bfbcf684b554e393c30b13b9f3b001a7ee" + integrity sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg== xmlhttprequest@>=1.5.0: version "1.8.0" @@ -11365,9 +11410,9 @@ xpath@0.0.32: integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw== xss@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" - integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== + version "1.0.9" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2" + integrity sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ== dependencies: commander "^2.20.3" cssfilter "0.0.10" diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.nix b/pkgs/servers/web-apps/hedgedoc/yarn.nix index 4024310c6a9..d18891f619f 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -98,11 +98,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; + name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; + sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; }; } { @@ -330,27 +330,27 @@ }; } { - name = "_types_node___node_15.0.1.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_15.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz"; - sha1 = "ef34dea0881028d11398be5bf4e856743e3dc35a"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.20.11.tgz"; + name = "_types_node___node_12.20.12.tgz"; path = fetchurl { - name = "_types_node___node_12.20.11.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz"; - sha1 = "980832cd56efafff8c18aa148c4085eb02a483f4"; + name = "_types_node___node_12.20.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz"; + sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226"; }; } { - name = "_types_node___node_14.14.43.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_14.14.43.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz"; - sha1 = "26bcbb0595b305400e8ceaf9a127a7f905ae49c8"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { @@ -442,11 +442,11 @@ }; } { - name = "_types_webpack___webpack_4.41.27.tgz"; + name = "_types_webpack___webpack_4.41.28.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.41.27.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz"; - sha1 = "f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"; + name = "_types_webpack___webpack_4.41.28.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz"; + sha1 = "0069a2159b7ad4d83d0b5801942c17d54133897b"; }; } { @@ -602,27 +602,27 @@ }; } { - name = "_webpack_cli_configtest___configtest_1.0.2.tgz"; + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; path = fetchurl { - name = "_webpack_cli_configtest___configtest_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz"; - sha1 = "2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836"; + name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; + sha1 = "204bcff87cda3ea4810881f7ea96e5f5321b87b9"; }; } { - name = "_webpack_cli_info___info_1.2.3.tgz"; + name = "_webpack_cli_info___info_1.2.4.tgz"; path = fetchurl { - name = "_webpack_cli_info___info_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz"; - sha1 = "ef819d10ace2976b6d134c7c823a3e79ee31a92c"; + name = "_webpack_cli_info___info_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz"; + sha1 = "7381fd41c9577b2d8f6c2594fad397ef49ad5573"; }; } { - name = "_webpack_cli_serve___serve_1.3.1.tgz"; + name = "_webpack_cli_serve___serve_1.4.0.tgz"; path = fetchurl { - name = "_webpack_cli_serve___serve_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz"; - sha1 = "911d1b3ff4a843304b9c3bacf67bb34672418441"; + name = "_webpack_cli_serve___serve_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz"; + sha1 = "f84fd07bcacefe56ce762925798871092f0f228e"; }; } { @@ -762,11 +762,11 @@ }; } { - name = "ajv___ajv_8.2.0.tgz"; + name = "ajv___ajv_8.3.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; - sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; + name = "ajv___ajv_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz"; + sha1 = "25ee7348e32cdc4a1dbb38256bf6bdc451dd577c"; }; } { @@ -1122,11 +1122,11 @@ }; } { - name = "aws_sdk___aws_sdk_2.898.0.tgz"; + name = "aws_sdk___aws_sdk_2.904.0.tgz"; path = fetchurl { - name = "aws_sdk___aws_sdk_2.898.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.898.0.tgz"; - sha1 = "fd07b9748d302fccc2d1e069ae313e911b526578"; + name = "aws_sdk___aws_sdk_2.904.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz"; + sha1 = "45a53e918698e451f762e44005dfce177a50b7e6"; }; } { @@ -2162,11 +2162,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001220.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz"; - sha1 = "c080e1c8eefb99f6cc9685da6313840bdbaf4c36"; + name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; + sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; }; } { @@ -3722,11 +3722,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.725.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz"; - sha1 = "04fc83f9189169aff50f0a00c6b4090b910cba85"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; }; } { @@ -3786,11 +3786,11 @@ }; } { - name = "engine.io_client___engine.io_client_3.5.1.tgz"; + name = "engine.io_client___engine.io_client_3.5.2.tgz"; path = fetchurl { - name = "engine.io_client___engine.io_client_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz"; - sha1 = "b500458a39c0cd197a921e0e759721a746d0bdb9"; + name = "engine.io_client___engine.io_client_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz"; + sha1 = "0ef473621294004e9ceebe73cef0af9e36f2f5fa"; }; } { @@ -3914,6 +3914,22 @@ }; } { + name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; + path = fetchurl { + name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; + url = "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz"; + sha1 = "f5a3602a89a3b728506ae3e1887304fffeef9270"; + }; + } + { + name = "esbuild___esbuild_0.11.20.tgz"; + path = fetchurl { + name = "esbuild___esbuild_0.11.20.tgz"; + url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz"; + sha1 = "7cefa1aee8b372c184e42457885f7ce5d3e62a1e"; + }; + } + { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; @@ -4042,19 +4058,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.25.0.tgz"; + name = "eslint___eslint_7.26.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.25.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; - sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; + name = "eslint___eslint_7.26.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz"; + sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6"; }; } { @@ -4410,11 +4426,11 @@ }; } { - name = "file_type___file_type_16.3.0.tgz"; + name = "file_type___file_type_16.4.0.tgz"; path = fetchurl { - name = "file_type___file_type_16.3.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-16.3.0.tgz"; - sha1 = "f03af91db30f92cc9a0b335c0644c46101522f6d"; + name = "file_type___file_type_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz"; + sha1 = "464197e44bd94a452d77b09085d977ae0dad2df4"; }; } { @@ -4578,11 +4594,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; + name = "follow_redirects___follow_redirects_1.14.1.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; - sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; + name = "follow_redirects___follow_redirects_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz"; + sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43"; }; } { @@ -4906,6 +4922,14 @@ }; } { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { name = "globals___globals_12.4.0.tgz"; path = fetchurl { name = "globals___globals_12.4.0.tgz"; @@ -5266,11 +5290,11 @@ }; } { - name = "i18n___i18n_0.13.2.tgz"; + name = "i18n___i18n_0.13.3.tgz"; path = fetchurl { - name = "i18n___i18n_0.13.2.tgz"; - url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz"; - sha1 = "3886678fe7cbbed45bac2ce53b8144c788a1c1b5"; + name = "i18n___i18n_0.13.3.tgz"; + url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz"; + sha1 = "5820f48d87a77cf14e064719bee9bc682ed550eb"; }; } { @@ -5330,11 +5354,11 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; + name = "ignore_walk___ignore_walk_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha1 = "c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"; }; } { @@ -5578,11 +5602,11 @@ }; } { - name = "is_bigint___is_bigint_1.0.1.tgz"; + name = "is_bigint___is_bigint_1.0.2.tgz"; path = fetchurl { - name = "is_bigint___is_bigint_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; - sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2"; + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; }; } { @@ -5610,11 +5634,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"; + name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; + sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; }; } { @@ -5650,11 +5674,11 @@ }; } { - name = "is_core_module___is_core_module_2.3.0.tgz"; + name = "is_core_module___is_core_module_2.4.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; - sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; + name = "is_core_module___is_core_module_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; + sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; }; } { @@ -5674,11 +5698,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.2.tgz"; + name = "is_date_object___is_date_object_1.0.4.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + name = "is_date_object___is_date_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; + sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5"; }; } { @@ -5850,11 +5874,11 @@ }; } { - name = "is_number_object___is_number_object_1.0.4.tgz"; + name = "is_number_object___is_number_object_1.0.5.tgz"; path = fetchurl { - name = "is_number_object___is_number_object_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz"; - sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197"; + name = "is_number_object___is_number_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; + sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; }; } { @@ -5938,11 +5962,11 @@ }; } { - name = "is_regex___is_regex_1.1.2.tgz"; + name = "is_regex___is_regex_1.1.3.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; - sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; + name = "is_regex___is_regex_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; + sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; }; } { @@ -5970,11 +5994,11 @@ }; } { - name = "is_string___is_string_1.0.5.tgz"; + name = "is_string___is_string_1.0.6.tgz"; path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + name = "is_string___is_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; + sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; }; } { @@ -5986,11 +6010,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.3.tgz"; + name = "is_symbol___is_symbol_1.0.4.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; }; } { @@ -6130,6 +6154,14 @@ }; } { + name = "joycon___joycon_3.0.1.tgz"; + path = fetchurl { + name = "joycon___joycon_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz"; + sha1 = "9074c9b08ccf37a6726ff74a18485f85efcaddaf"; + }; + } + { name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; path = fetchurl { name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; @@ -6194,14 +6226,6 @@ }; } { - name = "js_yaml___js_yaml_4.0.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; - sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; - }; - } - { name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; @@ -6210,6 +6234,14 @@ }; } { + name = "js_yaml___js_yaml_4.0.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; + sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; + }; + } + { name = "js_yaml___js_yaml_4.1.0.tgz"; path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; @@ -7250,11 +7282,11 @@ }; } { - name = "mermaid___mermaid_8.9.3.tgz"; + name = "mermaid___mermaid_8.10.1.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.9.3.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.3.tgz"; - sha1 = "24f682d26f757ed4cb5812b0a798eddcedcc9658"; + name = "mermaid___mermaid_8.10.1.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz"; + sha1 = "9573f702024e2173f4aa07d9b207d750507cf838"; }; } { @@ -7538,11 +7570,11 @@ }; } { - name = "mocha___mocha_8.3.2.tgz"; + name = "mocha___mocha_8.4.0.tgz"; path = fetchurl { - name = "mocha___mocha_8.3.2.tgz"; - url = "https://registry.yarnpkg.com/mocha/-/mocha-8.3.2.tgz"; - sha1 = "53406f195fa86fbdebe71f8b1c6fb23221d69fcc"; + name = "mocha___mocha_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz"; + sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff"; }; } { @@ -7674,11 +7706,11 @@ }; } { - name = "nanoid___nanoid_3.1.22.tgz"; + name = "nanoid___nanoid_3.1.23.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.22.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; - sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; }; } { @@ -7962,11 +7994,11 @@ }; } { - name = "object_inspect___object_inspect_1.10.2.tgz"; + name = "object_inspect___object_inspect_1.10.3.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.10.2.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz"; - sha1 = "b6385a3e2b7cae0b5eafcf90cddf85d128767f30"; + name = "object_inspect___object_inspect_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; + sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; }; } { @@ -9002,11 +9034,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; - sha1 = "042d74e137db83e6f294712096cb413f5aa612c4"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; }; } { @@ -9050,11 +9082,11 @@ }; } { - name = "postcss___postcss_8.2.13.tgz"; + name = "postcss___postcss_8.2.15.tgz"; path = fetchurl { - name = "postcss___postcss_8.2.13.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz"; - sha1 = "dbe043e26e3c068e45113b1ed6375d2d37e2129f"; + name = "postcss___postcss_8.2.15.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz"; + sha1 = "9e66ccf07292817d226fc315cbbf9bc148fbca65"; }; } { @@ -11146,11 +11178,11 @@ }; } { - name = "table___table_6.6.0.tgz"; + name = "table___table_6.7.0.tgz"; path = fetchurl { - name = "table___table_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; - sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; + name = "table___table_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz"; + sha1 = "26274751f0ee099c547f6cb91d3eff0d61d155b2"; }; } { @@ -11514,6 +11546,14 @@ }; } { + name = "type_fest___type_fest_1.1.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz"; + sha1 = "210251e7f57357a1457269e6b34837fed067ac2c"; + }; + } + { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; @@ -11546,11 +11586,11 @@ }; } { - name = "uglify_js___uglify_js_3.13.5.tgz"; + name = "uglify_js___uglify_js_3.13.6.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.13.5.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz"; - sha1 = "5d71d6dbba64cf441f32929b1efce7365bb4f113"; + name = "uglify_js___uglify_js_3.13.6.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz"; + sha1 = "6815ac7fdd155d03c83e2362bb717e5b39b74013"; }; } { @@ -12122,11 +12162,11 @@ }; } { - name = "webpack_cli___webpack_cli_4.6.0.tgz"; + name = "webpack_cli___webpack_cli_4.7.0.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz"; - sha1 = "27ae86bfaec0cf393fcfd58abdc5a229ad32fd16"; + name = "webpack_cli___webpack_cli_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz"; + sha1 = "3195a777f1f802ecda732f6c95d24c0004bc5a35"; }; } { @@ -12146,6 +12186,14 @@ }; } { + name = "webpack_sources___webpack_sources_2.2.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz"; + sha1 = "058926f39e3d443193b6c31547229806ffd02bac"; + }; + } + { name = "webpack___webpack_4.46.0.tgz"; path = fetchurl { name = "webpack___webpack_4.46.0.tgz"; @@ -12402,11 +12450,11 @@ }; } { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; path = fetchurl { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; - sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz"; + sha1 = "dd6899bfbcf684b554e393c30b13b9f3b001a7ee"; }; } { @@ -12434,11 +12482,11 @@ }; } { - name = "xss___xss_1.0.8.tgz"; + name = "xss___xss_1.0.9.tgz"; path = fetchurl { - name = "xss___xss_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz"; - sha1 = "32feb87feb74b3dcd3d404b7a68ababf10700535"; + name = "xss___xss_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz"; + sha1 = "3ffd565571ff60d2e40db7f3b80b4677bec770d2"; }; } { diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 98a73e1acd3..7d4b04d3c94 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -10,6 +10,8 @@ , libiconv , AppKit , Security +, nghttp2 +, libgit2 , withStableFeatures ? true }: @@ -32,10 +34,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; + ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + # TODO investigate why tests are broken on darwin + # failures show that tests try to write to paths + # outside of TMPDIR + doCheck = ! stdenv.isDarwin; + checkPhase = '' runHook preCheck echo "Running cargo test" diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 3f0aca33d61..d717c249fee 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.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-YbWh4ZIlcxAD/8F/fsYIWjv5hKaHNNi+sNrD7Ax/xDw="; + sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 927c4ea033a..f9f34311653 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.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws="; + sha256 = "sha256-D4oqLyH5JU8AycRZuA0isQmE3UP/0WmBmKW3xvSzk2M="; }; - vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA="; + vendorSha256 = "sha256-R50alGFyb2ZR7PT1jIsYWMIO45CPet+A5wq+clC1NIY="; excludedPackages = "misc"; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cfb5ff125e2..62b45b65dc1 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.05.09"; + version = "2021.05.10"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-LgtS7IOGkw0K70UAP2a57ghIiJujVnQO5+j4ZanPZp4="; + sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o="; }; meta = with lib; { diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index f236a80547c..5512ce2b7b1 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -1,24 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub, lepton }: +{ lib, makeWrapper, buildGoModule, fetchFromGitHub, lepton }: buildGoModule { pname = "gb-backup"; - version = "unstable-2021-03-06"; + version = "unstable-2021-04-07"; src = fetchFromGitHub { owner = "leijurv"; repo = "gb"; - rev = "5a94e60148628fc7796d15c53d0ed87184322053"; - sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm"; + rev = "904813bf0bbce048af5795618d58c0b1953f9ff8"; + sha256 = "111jrcv4x38sc19xha5q3pd2297s13qh1maa7sa1k09hgypvgsxf"; }; vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx"; - buildInputs = [ lepton ]; + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ lepton ]; + + postFixup = '' + wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} + ''; meta = with lib; { description = "Gamer Backup, a super opinionated cloud backup system"; license = licenses.agpl3Only; maintainers = with maintainers; [ babbaj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 265495389b0..d0ad7803c79 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,18 +1,20 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config -, lz4, lzo, xz, zlib, zstd +, bzip2, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1swsw5j8rrjxdxsfyd446f6g8f0k3mwg15baivi953i69c9981qi"; + sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; - buildInputs = [ zlib xz lz4 lzo zstd ]; + buildInputs = [ bzip2 zlib xz lz4 lzo zstd ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/AgentD/squashfs-tools-ng"; diff --git a/pkgs/tools/graphics/mangohud/combined.nix b/pkgs/tools/graphics/mangohud/combined.nix deleted file mode 100644 index 4947cd66e3a..00000000000 --- a/pkgs/tools/graphics/mangohud/combined.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, pkgs, lib -, libXNVCtrl -}: -let - mangohud_64 = pkgs.callPackage ./default.nix { inherit libXNVCtrl; }; - mangohud_32 = pkgs.pkgsi686Linux.callPackage ./default.nix { inherit libXNVCtrl; }; -in -pkgs.buildEnv rec { - name = "mangohud-${mangohud_64.version}"; - - paths = [ mangohud_32 ] ++ lib.optionals stdenv.is64bit [ mangohud_64 ]; - - meta = mangohud_64.meta; -} diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 26260af50fe..0d3b8ed6f8e 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -1,72 +1,118 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , fetchpatch +, substituteAll +, coreutils +, curl +, gawk +, glxinfo +, gnugrep +, gnused +, pciutils +, xdg-utils +, dbus +, hwdata +, libX11 +, mangohud32 +, vulkan-headers +, glslang +, makeWrapper , meson , ninja , pkg-config , python3Packages -, dbus -, glslang -, libglvnd -, libXNVCtrl -, mesa -, vulkan-headers , vulkan-loader -, xorg +, libXNVCtrl }: - stdenv.mkDerivation rec { - pname = "mangohud${lib.optionalString stdenv.is32bit "_32"}"; - version = "0.4.1"; + pname = "mangohud"; + version = "0.6.1"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "v${version}"; - sha256 = "04v2ps8n15ph2smjgnssax5hq88bszw2kbcff37cnd5c8yysvfi6"; + sha256 = "1bzfp37qrx9kk5zaq7sfisgkyccwnxd7i3b1l0blfcy2lrxgx0n6"; fetchSubmodules = true; }; patches = [ + # Adds option to specify Vulkan's datadir when it's not the same as MangoHud's + # See https://github.com/flightlessmango/MangoHud/pull/522 (fetchpatch { - # FIXME obsolete in >=0.5.0 - url = "https://patch-diff.githubusercontent.com/raw/flightlessmango/MangoHud/pull/208.patch"; - sha256 = "1i6x6sr4az1zv0p6vpw99n947c7awgbbv087fghjlczhry676nmh"; + url = "https://github.com/flightlessmango/MangoHud/commit/56682985d8cec711af7ad0841888a44099249b1b.patch"; + sha256 = "0l5vb374lfgfh54jiy4097bzsccpv4zsl1fdhn55sxggklymcad8"; + }) + + # Hard code dependencies. Can't use makeWrapper since the Vulkan + # layer can be used without the mangohud executable by setting MANGOHUD=1. + (substituteAll { + src = ./hardcode-dependencies.patch; + + path = lib.makeBinPath [ + coreutils + curl + gawk + glxinfo + gnugrep + gnused + pciutils + xdg-utils + ]; + + libdbus = dbus.lib; + inherit hwdata libX11; + }) + ] ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") [ + # Support 32bit OpenGL applications by appending the mangohud32 + # lib path to LD_LIBRARY_PATH. + # + # This workaround is necessary since on Nix's build of ld.so, $LIB + # always expands to lib even when running an 32bit application. + # + # See https://github.com/NixOS/nixpkgs/issues/101597. + (substituteAll { + src = ./opengl32-nix-workaround.patch; + inherit mangohud32; }) ]; mesonFlags = [ - "-Dappend_libdir_mangohud=false" "-Duse_system_vulkan=enabled" - "--libdir=lib${lib.optionalString stdenv.is32bit "32"}" - ]; - - buildInputs = [ - dbus - glslang - libglvnd - libXNVCtrl - mesa - python3Packages.Mako - vulkan-headers - vulkan-loader - xorg.libX11 + "-Dvulkan_datadir=${vulkan-headers}/share" ]; nativeBuildInputs = [ + glslang + makeWrapper meson ninja pkg-config python3Packages.Mako python3Packages.python + vulkan-loader ]; - preConfigure = '' - mkdir -p "$out/share/vulkan/" - ln -sf "${vulkan-headers}/share/vulkan/registry/" $out/share/vulkan/ - ln -sf "${vulkan-headers}/include" $out + buildInputs = [ + dbus + libX11 + libXNVCtrl + ]; + + # Support 32bit Vulkan applications by linking in 32bit Vulkan layer + # This is needed for the same reason the 32bit OpenGL workaround is needed. + postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' + ln -s ${mangohud32}/share/vulkan/implicit_layer.d/MangoHud.json \ + "$out/share/vulkan/implicit_layer.d/MangoHud.x86.json" + ''; + + # Support overlaying Vulkan applications without requiring mangohud to be installed + postFixup = '' + wrapProgram "$out/bin/mangohud" \ + --prefix VK_LAYER_PATH : "$out/share/vulkan/implicit_layer.d" \ + --prefix VK_INSTANCE_LAYERS : VK_LAYER_MANGOHUD_overlay ''; meta = with lib; { @@ -74,6 +120,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flightlessmango/MangoHud"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ zeratax ]; + maintainers = with maintainers; [ metadark zeratax ]; }; } diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch new file mode 100644 index 00000000000..bdebcdca982 --- /dev/null +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -0,0 +1,57 @@ +diff --git a/src/dbus.cpp b/src/dbus.cpp +index 0acccc3..7dd7c49 100644 +--- a/src/dbus.cpp ++++ b/src/dbus.cpp +@@ -157,7 +157,7 @@ bool dbus_manager::init(const std::string& requested_player) { + m_requested_player = "org.mpris.MediaPlayer2." + requested_player; + } + +- if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) { ++ if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("@libdbus@/lib/libdbus-1.so.3")) { + std::cerr << "MANGOHUD: Could not load libdbus-1.so.3\n"; + return false; + } +diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp +index 25c65bf..87488d5 100644 +--- a/src/loaders/loader_x11.cpp ++++ b/src/loaders/loader_x11.cpp +@@ -88,4 +88,4 @@ void libx11_loader::CleanUp(bool unload) { + + } + +-std::shared_ptr<libx11_loader> g_x11(new libx11_loader("libX11.so.6")); ++std::shared_ptr<libx11_loader> g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); +diff --git a/src/logging.cpp b/src/logging.cpp +index f2c4271..d33e793 100644 +--- a/src/logging.cpp ++++ b/src/logging.cpp +@@ -17,7 +17,10 @@ string exec(string command) { + string result = ""; + + // Open pipe to file ++ char* originalPath = getenv("PATH"); ++ setenv("PATH", "@path@", 1); + FILE* pipe = popen(command.c_str(), "r"); ++ setenv("PATH", originalPath, 1); + if (!pipe) { + return "popen failed!"; + } +diff --git a/src/pci_ids.cpp b/src/pci_ids.cpp +index 4e2a6d2..9490869 100644 +--- a/src/pci_ids.cpp ++++ b/src/pci_ids.cpp +@@ -22,12 +22,9 @@ std::istream& get_uncommented_line(std::istream& is, std::string &line) + + void parse_pciids() + { +- std::ifstream file("/usr/share/hwdata/pci.ids"); ++ std::ifstream file("@hwdata@/share/hwdata/pci.ids"); + if(file.fail()){ +- std::ifstream file("/usr/share/misc/pci.ids"); +- if (file.fail()) +- printf("MANGOHUD: can't find file pci.ids\n"); +- ++ printf("MANGOHUD: can't find file pci.ids\n"); + } + + std::string line; diff --git a/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch new file mode 100644 index 00000000000..3c0f6908617 --- /dev/null +++ b/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch @@ -0,0 +1,12 @@ +diff --git a/bin/mangohud.in b/bin/mangohud.in +index eadce2d..e7b1aa4 100755 +--- a/bin/mangohud.in ++++ b/bin/mangohud.in +@@ -23,6 +23,6 @@ fi + # figure out whether the 32 or 64 bit version should be used, and will search + # for it in the correct directory + LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}" +-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@" ++LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" + + exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@" diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 9319fa9b610..18025f92e31 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -15,6 +15,7 @@ , libheif , librsvg , ApplicationServices +, Foundation , python27 , libpng , fetchFromGitHub @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { python27 libpng expat - ] ++ lib.optional stdenv.isDarwin ApplicationServices; + ] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation]; # Required by .pc file propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 75a5fc57410..3157fc51b58 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform +, libiconv +, Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { @@ -16,6 +20,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vy6q3hjp374lyg00zxim8aplh83iq3f4rrmpz5vnpwbag1fdql3"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security SystemConfiguration ]; + meta = with lib; { description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines"; homepage = "https://github.com/ellie/atuin"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 0fa7841074a..0aeef02f32d 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -4,33 +4,39 @@ , fetchCrate , installShellFiles , makeWrapper +, pkg-config +, libgit2 +, oniguruma , libiconv -, zlib , Security +, zlib }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.3.1"; + version = "1.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Iz9pXvgPIGUnfbnvk5kYAqlrMlz3I2kLszPe8GwwHVk="; + sha256 = "sha256-6UveXa0rMWt5FbmhB0CsYRMGMXxL8FB/XivB4Ec93PY="; }; - cargoHash = "sha256-eECAaTUgqasuDhLSk8p/CWSQmV8yV30UoMy3GZCRbGE="; + cargoHash = "sha256-c6U1ZOaXZ7RnKD7q0WTkam9gL8SL/naSeHGbB5I82lk="; nativeBuildInputs = [ - makeWrapper installShellFiles + makeWrapper + pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.isDarwin [ libiconv Security zlib ]; + RUSTONIG_SYSTEM_LIBONIG = true; + postPatch = '' # Fill the version stub in the man page. We can't fill the date # stub reproducibly. diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/tools/misc/castty/default.nix index ddda737c8b5..075c6d739b3 100644 --- a/pkgs/tools/misc/castty/default.nix +++ b/pkgs/tools/misc/castty/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { buildInputs = [ libsoundio lame ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; meta = with lib; { description = "CLI tool to record audio-enabled screencasts of your terminal, for the web"; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 51fbba8d706..d830b8d81fc 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: - +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which +, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick +, Foundation +}: stdenv.mkDerivation rec { version = "1.6.0"; @@ -23,7 +25,8 @@ stdenv.mkDerivation rec { docbook_xsl ]; - buildInputs = [ glib imagemagick ] ++ lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + buildInputs = [ glib imagemagick ] + ++ lib.optional stdenv.isDarwin Foundation; patches = [ ./xmlcatalog_patch.patch ]; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 27e661e2697..7fdaa319619 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cpulimit"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; - sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; + sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; }; buildFlags = with stdenv; [ ( diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/tools/misc/librespeed-cli/default.nix index b1ab29d8acb..09d6de6ad9d 100644 --- a/pkgs/tools/misc/librespeed-cli/default.nix +++ b/pkgs/tools/misc/librespeed-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "librespeed-cli"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "librespeed"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "sha256-cbLuAOAGWmYj6xR2AjpwvRXrP3SXfHhjUp5MVLqC0WE="; + sha256 = "sha256-rtZZgx5QNwYd6vXSts/ICSiXv7sMZA8ihHgxTjZ/6KQ="; }; vendorSha256 = "sha256-psZyyySpY06J+ji+9uHUtX7Ks1hzZC3zINszYP75NfQ="; diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/tools/misc/minipro/default.nix new file mode 100644 index 00000000000..95385a47e59 --- /dev/null +++ b/pkgs/tools/misc/minipro/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "minipro"; + version = "0.5"; + + src = fetchFromGitLab { + owner = "DavidGriffith"; + repo = "minipro"; + rev = version; + sha256 = "sha256-Hyj2LyY7W8opjigH+QLHHbDyelC0LMgGgdN+u3nNoJc="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ]; + makeFlags = [ + "PREFIX=$(out)" + "UDEV_DIR=$(out)/lib/udev" + "COMPLETIONS_DIR=$(out)/share/bash-completion/completions" + "PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + "CC=${stdenv.cc.targetPrefix}cc" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/DavidGriffith/minipro"; + description = "An open source program for controlling the MiniPRO TL866xx series of chip programmers"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bmwalters ]; + }; +} diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index b3f58c4cdb1..a82a71abf96 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -19,7 +19,8 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace setup.py \ --replace 'requests>=2.24.0' 'requests~=2.23' \ --replace 'beautifulsoup4==4.9.1' 'beautifulsoup4~=4.9' \ - --replace 'colorama==0.4.3' 'colorama~=0.4' + --replace 'colorama==0.4.3' 'colorama~=0.4' \ + --replace 'unidecode==1.1.1' 'unidecode~=1.2' ''; preBuild = "export HOME=$NIX_BUILD_TOP"; diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix index 95a4bbe9fb8..cff22fa71e6 100644 --- a/pkgs/tools/networking/anevicon/default.nix +++ b/pkgs/tools/networking/anevicon/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform +, libiconv , Security }: @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoPatches = [ # Add Cargo.lock file, https://github.com/rozgo/anevicon/pull/1 @@ -30,6 +31,9 @@ rustPlatform.buildRustPackage rec { }) ]; + # Tries to send large UDP packets that Darwin rejects. + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "UDP-based load generator"; homepage = "https://github.com/rozgo/anevicon"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index e57409fe558..1ce22c2ee2a 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.2"; + version = "9.1.3"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88="; + sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM="; }; - vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s="; + vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4="; doCheck = false; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 633c932def8..5f83ffae055 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla"; + sha256 = "sha256-xw2AtI1AqcuZ7JZ8xDifZ+fwMBUopp1IFXIEEzGmRr4="; }; mesonFlags = [ diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix new file mode 100644 index 00000000000..3858d87e7ed --- /dev/null +++ b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gtest, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "libtorrent-jesec"; + version = "0.13.8-r1"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "libtorrent"; + rev = "v${version}"; + sha256 = "sha256-Eh5pMkSe9uO0dPRWDg2BbbRxxuvX9FM2/OReq/61ojc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # https://github.com/jesec/libtorrent/issues/1 + doCheck = false; + checkInputs = [ gtest ]; + + meta = with lib; { + description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; + homepage = "https://github.com/jesec/libtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix new file mode 100644 index 00000000000..5b973a84ebc --- /dev/null +++ b/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, libtorrent-jesec +, curl +, ncurses +, xmlrpc_c +, nlohmann_json +, xmlRpcSupport ? true +, jsonRpcSupport ? true +}: +let + inherit (lib) optional; +in +stdenv.mkDerivation rec { + pname = "rtorrent-jesec"; + version = "0.9.8-r13"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = "rtorrent"; + rev = "v${version}"; + sha256 = "1srn1ms7dvsn994zvb8i4m6gc144ygc7wc2a23bma79cqpl7drlw"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libtorrent-jesec curl ncurses ] + ++ optional xmlRpcSupport xmlrpc_c + ++ optional jsonRpcSupport nlohmann_json; + + cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ] + ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO" + ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"; + + doCheck = true; + checkInputs = [ gtest ]; + + prePatch = '' + substituteInPlace src/main.cc \ + --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc" + ''; + + postFixup = '' + mkdir -p $out/etc/rtorrent + cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc + ''; + + meta = with lib; { + description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; + homepage = "https://github.com/jesec/rtorrent"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 68b4859a5fb..13efa6e999c 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bvLkeC5Hm1enaWJtYmnnINgpSO3tlg1SsEzeMSF9OXk="; + sha256 = "sha256-2LyCiW1MrAahpbzyxot0INPMzo0Vl/JToMZTinCQdgs="; }; - cargoSha256 = "sha256-BUo3Y2tLvhOrk2w2GzYeWKpXH7TAOEdBI6vVtW2/cCs="; + cargoSha256 = "sha256-AGwiyC7Zf8KHQIHfHByL06sdbS4vEXUyj1wGw7Q1N9I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 8bdcd8708d9..5972d781bd1 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20210315"; + version = "1.0.20210424"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "sha256-aCqgjriqhBInK7C7KapoKVfgj+zreGQzacMKwbMF1Og="; + sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4dfdb7075a5..a16e74819a6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,6 +227,12 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); - nixFlakes = nixUnstable; + nixExperimental = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ]; + }); + + nixFlakes = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; + }); } diff --git a/pkgs/tools/package-management/nix/enable-all-experimental.patch b/pkgs/tools/package-management/nix/enable-all-experimental.patch new file mode 100644 index 00000000000..1712b7295a5 --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-all-experimental.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc +index d3b27d7be..e7d002e1d 100644 +--- a/src/libstore/globals.cc ++++ b/src/libstore/globals.cc +@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature) + + void Settings::requireExperimentalFeature(const std::string & name) + { +- if (!isExperimentalFeatureEnabled(name)) +- throw MissingExperimentalFeature(name); ++ return; + } + + bool Settings::isWSL1() diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch new file mode 100644 index 00000000000..998067449b7 --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-flakes.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh +index 3e4ead76c..81d407236 100644 +--- a/src/libstore/globals.hh ++++ b/src/libstore/globals.hh +@@ -923,7 +923,8 @@ public: + value. + )"}; + +- Setting<Strings> experimentalFeatures{this, {}, "experimental-features", ++ Setting<Strings> experimentalFeatures{ ++ this, {"flakes", "nix-command"}, "experimental-features", + "Experimental Nix features to enable."}; + + bool isExperimentalFeatureEnabled(const std::string & name); diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index edec05272b9..4cf5338ca2e 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,21 +1,39 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs -, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config +, encfs, libsecret , glib , libgee, gtk3, vala, wrapGAppsHook, xorg +, gobject-introspection }: stdenv.mkDerivation rec { - version = "1.8.19"; + version = "1.9"; pname = "gnome-encfs-manager"; src = fetchurl { - url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; - sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; + url = with lib.versions; + "https://launchpad.net/gencfsm/trunk/${major version}.${minor version}/+download/gnome-encfs-manager_${version}.tar.xz"; + sha256 = "RXVwg/xhfAQv3pWp3UylOhMKDh9ZACTuKM4lPrn1dk8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake intltool libtool vala glib encfs - gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE - wrapGAppsHook gobject-introspection ]; - + nativeBuildInputs = [ + autoconf + automake + intltool + libtool + pkg-config + vala + wrapGAppsHook + ]; + buildInputs = [ + glib + encfs + gtk3 + libgee + xorg.libSM + xorg.libICE + gobject-introspection + libsecret + ]; + + # Fix hardcoded paths to /bin/mkdir patches = [ ./makefile-mkdir.patch ]; preConfigure = '' diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 1c097297041..26dc89d935f 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, DiskArbitration +, Foundation +, IOKit +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-z0WLD6XOlsM5UL9/nUU5Jk1F+UFLm4N42zAlgY3zEbM="; + sha256 = "sha256-/O/VXBpVBgjzYuv1AghzmOBUu0MQXhuF65QswgNwa0k="; }; prePatch = '' @@ -17,9 +26,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + DiskArbitration + Foundation + IOKit + libiconv + ]; - cargoSha256 = "sha256-m2UVpsVTEmf6fgE1CFRE6+3097bKnkrMKtY3fAOjS2E="; + cargoSha256 = "sha256-5AZgOzRg7jEyv/4+IiQplrwt2yQO9yNi6BosdSzh5v8="; doCheck = false; diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index 610b494439c..511931f0380 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -1,8 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, python3Packages -, perl +, yuicompressor , zopfli , stdenv }: @@ -23,8 +22,7 @@ buildGoModule { doCheck = false; nativeBuildInputs = [ - python3Packages.slimit - (perl.withPackages (p: [ p.CSSMinifier ])) + yuicompressor zopfli ]; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 185b2a41c46..9a5226d98b2 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.2"; + version = "2.4.3"; - src = fetchurl { - url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk"; + src = fetchFromGitHub { + owner = "vslavik"; + repo = "poedit"; + rev = "v${version}-oss"; + sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook @@ -41,6 +43,6 @@ stdenv.mkDerivation rec { homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dasj19 ]; }; } diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 755909f2b33..e80c4326651 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -1,64 +1,75 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config , gettext +, ghostscript , guile -, guile-reader , guile-lib -, ploticus +, guile-reader , imagemagick -, ghostscript -, transfig -, enableEmacs ? false, emacs ? null -, enableLout ? true, lout ? null -, enableTex ? true, tex ? null , makeWrapper +, pkg-config +, ploticus +, transfig +, enableEmacs ? false, emacs +, enableLout ? true, lout +, enableTex ? true, tex }: let + inherit (lib) optional; +in stdenv.mkDerivation rec{ pname = "skribilo"; version = "0.9.5"; - inherit (lib) optional; -in stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "sha256-AIJqIcRjT7C0EO6J60gGjERdgAglh0ZU49U9XKPwvwk="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; - - buildInputs = [ gettext guile ploticus imagemagick ghostscript transfig ] + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = [ + gettext + ghostscript + guile + guile-lib + guile-reader + imagemagick + ploticus + transfig + ] ++ optional enableEmacs emacs ++ optional enableLout lout ++ optional enableTex tex; - propagatedBuildInputs = [ guile-reader guile-lib ]; - - postInstall = '' - wrapProgram $out/bin/skribilo \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" \ - --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-lib}/share/guile/site:${guile-reader}/share/guile/site" - ''; + postInstall = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + wrapProgram $out/bin/skribilo \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/${guileVersion}:$GUILE_LOAD_PATH" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/lib/guile/${guileVersion}/site-ccache:$GUILE_LOAD_COMPILED_PATH" + ''; - meta = with lib;{ + meta = with lib; { + homepage = "https://www.nongnu.org/skribilo/"; description = "The Ultimate Document Programming Framework"; longDescription = '' - Skribilo is a free document production tool that takes a - structured document representation as its input and renders that - document in a variety of output formats: HTML and Info for - on-line browsing, and Lout and LaTeX for high-quality hard - copies. + Skribilo is a free document production tool that takes a structured + document representation as its input and renders that document in a + variety of output formats: HTML and Info for on-line browsing, and Lout + and LaTeX for high-quality hard copies. The input document can use Skribilo's markup language to provide - information about the document's structure, which is similar to - HTML or LaTeX and does not require expertise. Alternatively, it - can use a simpler, "markup-less" format that borrows from Emacs' - outline mode and from other conventions used in emails, Usenet - and text. + information about the document's structure, which is similar to HTML or + LaTeX and does not require expertise. Alternatively, it can use a simpler, + "markup-less" format that borrows from Emacs' outline mode and from other + conventions used in emails, Usenet and text. ''; - homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index 07e89f9f8ed..bd21ad4c437 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pkg-config zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99786e6837e..d695650e354 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -156,7 +156,9 @@ in antsimulator = callPackage ../games/antsimulator { }; - atuin = callPackage ../tools/misc/atuin { }; + atuin = callPackage ../tools/misc/atuin { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; fiche = callPackage ../servers/fiche { }; @@ -2417,6 +2419,8 @@ in dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earthly = callPackage ../development/tools/earthly { }; + earlybird = callPackage ../tools/security/earlybird { }; earlyoom = callPackage ../os-specific/linux/earlyoom { }; @@ -3654,7 +3658,9 @@ in cfssl = callPackage ../tools/security/cfssl { }; - chafa = callPackage ../tools/misc/chafa { }; + chafa = callPackage ../tools/misc/chafa { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; @@ -6203,6 +6209,8 @@ in minidlna = callPackage ../tools/networking/minidlna { }; + minipro = callPackage ../tools/misc/minipro { }; + minisign = callPackage ../tools/security/minisign { }; ministat = callPackage ../tools/misc/ministat { }; @@ -6456,6 +6464,8 @@ in libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { }; + libmpack = callPackage ../development/libraries/libmpack { }; libiberty = callPackage ../development/libraries/libiberty { }; @@ -6609,8 +6619,9 @@ in mandoc = callPackage ../tools/misc/mandoc { }; - mangohud = callPackage ../tools/graphics/mangohud/combined.nix { + mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + mangohud32 = pkgsi686Linux.mangohud; }; manix = callPackage ../tools/nix/manix { @@ -8173,6 +8184,8 @@ in rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; + rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { }; + rubber = callPackage ../tools/typesetting/rubber { }; rubocop = callPackage ../development/tools/rubocop { }; @@ -11867,6 +11880,7 @@ in erlang_nox = beam_nox.interpreters.erlang; inherit (beam.packages.erlang) + erlang-ls rebar rebar3 rebar3WithPlugins fetchHex beamPackages relxExe; @@ -19206,10 +19220,19 @@ in miniflux = callPackage ../servers/miniflux { }; - nagios = callPackage ../servers/monitoring/nagios { }; + icinga2 = callPackage ../servers/monitoring/icinga2 { }; + + icinga2-agent = callPackage ../servers/monitoring/icinga2 { + nameSuffix = "-agent"; + withMysql = false; + withNotification = false; + withIcingadb = false; + }; munin = callPackage ../servers/monitoring/munin { }; + nagios = callPackage ../servers/monitoring/nagios { }; + monitoring-plugins = callPackage ../servers/monitoring/plugins { }; inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) @@ -20150,6 +20173,13 @@ in ]; }; + linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20454,6 +20484,7 @@ in linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); + linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -25090,6 +25121,8 @@ in ptex = callPackage ../development/libraries/ptex {}; + pyright = nodePackages.pyright; + qbec = callPackage ../applications/networking/cluster/qbec { }; qemacs = callPackage ../applications/editors/qemacs { }; @@ -28423,6 +28456,8 @@ in nativeOnly = true; }).run; + steam-tui = callPackage ../games/steam-tui { }; + steamcmd = steamPackages.steamcmd; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { @@ -30181,7 +30216,8 @@ in nix nixStable nixUnstable - nixFlakes; + nixFlakes + nixExperimental; nixStatic = pkgsStatic.nix; @@ -30833,7 +30869,7 @@ in vimb = wrapFirefox vimb-unwrapped { }; vips = callPackage ../tools/graphics/vips { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; nip2 = callPackage ../tools/graphics/nip2 { }; @@ -31355,7 +31391,9 @@ in treefmt = callPackage ../development/tools/treefmt { }; - bottom = callPackage ../tools/system/bottom {}; + bottom = callPackage ../tools/system/bottom { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d75625019b..54feeb8001f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1928,8 +1928,6 @@ in { django-picklefield = callPackage ../development/python-modules/django-picklefield { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; - django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; @@ -5300,6 +5298,8 @@ in { py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); |