From 4c135f04bd291a79a8ed4c8fc25c1b9a76df0e63 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Wed, 29 Mar 2023 20:28:20 -0400 Subject: [PATCH 001/182] twitter-color-emoji: 14.0.2 -> 14.1.2 This update switches to @jdecked's fork, which is now used by Discord. Elon Musk fired the employees who maintained Twemoji; @jdecked is one of the two former employees who maintained it, so it seems likely this could become the new upstream of its development. https://github.com/jdecked/twemoji/issues/10#issuecomment-1487768059 --- pkgs/data/fonts/twitter-color-emoji/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index a01b02bdfaf0..4a9e8171afa4 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "14.0.0"; + version = "14.1.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; - owner = "twitter"; + owner = "jdecked"; repo = "twemoji"; rev = "v${version}"; - sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg="; + sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ="; }; pythonEnv = @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { This font uses Google’s CBDT format making it work on Android and Linux graphical stack. ''; - homepage = "https://twemoji.twitter.com/"; + homepage = "https://github.com/jdecked/twemoji"; # In noto-emoji-fonts source ## noto-emoji code is in ASL 2.0 license ## Emoji fonts are under OFL license From 712adfbb27f3369b18adee28a6e0939833d8ec31 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 30 Mar 2023 22:59:47 +0300 Subject: [PATCH 002/182] obs-studio-plugins.obs-teleport: init at 0.6.5 Closes #223775. --- .../video/obs-studio/plugins/default.nix | 2 + .../plugins/obs-teleport/default.nix | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 049636dd59d3..0f6b9ef878ca 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -32,6 +32,8 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-teleport = callPackage ./obs-teleport { }; + obs-vaapi = callPackage ./obs-vaapi { }; obs-vkcapture = callPackage ./obs-vkcapture.nix { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix new file mode 100644 index 000000000000..7aa0739a938b --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -0,0 +1,54 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, libjpeg +, nix-update-script +, obs-studio +}: + +buildGoModule rec { + pname = "obs-teleport"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = "obs-teleport"; + rev = version; + sha256 = "sha256-J3Q0AQV21jh+Pth5wXbGbryrx7Mg65rAQVapyGBls7Y="; + }; + + vendorHash = "sha256-2rlEMkdcD+46EpQhUpLIGMzqvlyMFYK/XQYV9DJZxao="; + + buildInputs = [ + libjpeg + obs-studio + ]; + + ldflags = [ "-s" "-w" ]; + + CGO_CFLAGS = "-I${obs-studio}/include/obs"; + CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api"; + + buildPhase = '' + runHook preBuild + + go build -buildmode=c-shared -o obs-teleport.so . + + runHook postBuild + ''; + + postInstall = '' + mkdir -p $out/lib/obs-plugins + mv obs-teleport.so $out/lib/obs-plugins + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An OBS Studio plugin for an open NDI-like replacement"; + homepage = "https://github.com/fzwoch/obs-teleport"; + maintainers = [ lib.maintainers.paveloom ]; + license = lib.licenses.gpl2Plus; + platforms = obs-studio.meta.platforms; + }; +} From ae08ff7b7172d3d99c95fb94b79489c39b3db78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Sat, 3 Dec 2022 13:29:16 +0100 Subject: [PATCH 003/182] xcodeenv: allow versions higher than specified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add `allowHigher` option to let higher versions of Xcode. This is useful when xcodeenv is used for `nix-shell` for developers and their xcode version might be a bit newer than required one. Signed-off-by: Jakub Sokołowski --- .../mobile/xcodeenv/compose-xcodewrapper.nix | 19 ++++++++++++++----- pkgs/development/mobile/xcodeenv/default.nix | 14 ++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index 0a469da418a1..fa9e89337615 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,10 +1,13 @@ -{stdenv}: -{version ? "11.1", xcodeBaseDir ? "/Applications/Xcode.app"}: +{ stdenv, lib }: +{ version ? "11.1" +, allowHigher ? false +, xcodeBaseDir ? "/Applications/Xcode.app" }: assert stdenv.isDarwin; stdenv.mkDerivation { - name = "xcode-wrapper-"+version; + pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}"; + inherit version; buildCommand = '' mkdir -p $out/bin cd $out/bin @@ -24,9 +27,15 @@ stdenv.mkDerivation { ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" # Check if we have the xcodebuild version that we want - if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ] + currVer=$($out/bin/xcodebuild -version | head -n1) + ${if allowHigher then '' + if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ] + '' else '' + if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ] + ''} then - echo "We require xcodebuild version: ${version}" + echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}" + echo "Instead what was found: $currVer" exit 1 fi ''; diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index 90642ca7d9ac..f63ed63c0479 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,15 +1,9 @@ -{ stdenv, lib }: +{ callPackage }: rec { - composeXcodeWrapper = import ./compose-xcodewrapper.nix { - inherit stdenv; - }; + composeXcodeWrapper = callPackage ./compose-xcodewrapper.nix { }; - buildApp = import ./build-app.nix { - inherit stdenv lib composeXcodeWrapper; - }; + buildApp = callPackage ./build-app.nix { inherit composeXcodeWrapper; }; - simulateApp = import ./simulate-app.nix { - inherit stdenv lib composeXcodeWrapper; - }; + simulateApp = callPackage ./simulate-app.nix { inherit composeXcodeWrapper; }; } From e30dafc09bd4df9b27dac77c3655f4d5836915e9 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 19 Aug 2022 13:16:51 -0600 Subject: [PATCH 004/182] nixos: add module for GameScope --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/gamescope.nix | 84 ++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 nixos/modules/programs/gamescope.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f1c459f75570..351da1d009a0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -171,6 +171,7 @@ ./programs/fuse.nix ./programs/fzf.nix ./programs/gamemode.nix + ./programs/gamescope.nix ./programs/geary.nix ./programs/git.nix ./programs/gnome-disks.nix diff --git a/nixos/modules/programs/gamescope.nix b/nixos/modules/programs/gamescope.nix new file mode 100644 index 000000000000..ac2c7db0237d --- /dev/null +++ b/nixos/modules/programs/gamescope.nix @@ -0,0 +1,84 @@ +{ config +, lib +, pkgs +, ... +}: +with lib; let + cfg = config.programs.gamescope; + + gamescope = + let + wrapperArgs = + optional (cfg.args != [ ]) + ''--add-flags "${toString cfg.args}"'' + ++ builtins.attrValues (mapAttrs (var: val: "--set-default ${var} ${val}") cfg.env); + in + pkgs.runCommand "gamescope" { nativeBuildInputs = [ pkgs.makeBinaryWrapper ]; } '' + mkdir -p $out/bin + makeWrapper ${cfg.package}/bin/gamescope $out/bin/gamescope --inherit-argv0 \ + ${toString wrapperArgs} + ''; +in +{ + options.programs.gamescope = { + enable = mkEnableOption (mdDoc "gamescope"); + + package = mkOption { + type = types.package; + default = pkgs.gamescope; + defaultText = literalExpression "pkgs.gamescope"; + description = mdDoc '' + The GameScope package to use. + ''; + }; + + capSysNice = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Add cap_sys_nice capability to the GameScope binary. + ''; + }; + + args = mkOption { + type = types.listOf types.string; + default = [ ]; + example = [ "--rt" "--prefer-vk-device 8086:9bc4" ]; + description = mdDoc '' + Arguments passed to GameScope on startup. + ''; + }; + + env = mkOption { + type = types.attrsOf types.string; + default = { }; + example = literalExpression '' + # for Prime render offload on Nvidia laptops. + # Also requires `hardware.nvidia.prime.offload.enable`. + { + __NV_PRIME_RENDER_OFFLOAD = "1"; + __VK_LAYER_NV_optimus = "NVIDIA_only"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + } + ''; + description = mdDoc '' + Default environment variables available to the GameScope process, overridable at runtime. + ''; + }; + }; + + config = mkIf cfg.enable { + security.wrappers = mkIf cfg.capSysNice { + gamescope = { + owner = "root"; + group = "root"; + source = "${gamescope}/bin/gamescope"; + capabilities = "cap_sys_nice+pie"; + }; + }; + + environment.systemPackages = mkIf (!cfg.capSysNice) [ gamescope ]; + }; + + meta.maintainers = with maintainers; [ nrdxp ]; +} From 29f8a52d9fa98dcb7ca9a633f4e57af23e77d3db Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 20 Apr 2023 11:31:54 +0200 Subject: [PATCH 005/182] aiac: Init at 2.2.0 Remove doCheck=true; --- .../networking/cluster/aiac/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/aiac/default.nix diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix new file mode 100644 index 000000000000..578eb0bca0d1 --- /dev/null +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aiac"; + version = "2.2.0"; + excludedPackages = [".ci"]; + + src = fetchFromGitHub { + owner = "gofireflyio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Ju2LoCDY4lQaiJ3OSkt01SaOqVLrDGiTAwxxRnbnz/0="; + }; + + vendorHash = "sha256-UaC3Ez/i+kPQGOJYtCRtaD2pn3kVZPTaoCcNG7LiFbY="; + ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ]; + + meta = with lib; { + description = ''Artificial Intelligence Infrastructure-as-Code Generator.''; + homepage = "https://github.com/gofireflyio/aiac/"; + license = licenses.asl20; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89d0a2fae172..db1480dafebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38211,6 +38211,8 @@ with pkgs; atmos = callPackage ../applications/networking/cluster/atmos { }; + aiac = callPackage ../applications/networking/cluster/aiac { }; + fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; areca = callPackage ../applications/backup/areca { From 1990c793f930d6c714e7a6191d0a20ae6d15c69c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 24 Apr 2023 00:13:54 +0200 Subject: [PATCH 006/182] esphome: 2023.4.0 -> 2023.4.1 https://github.com/esphome/esphome/releases/tag/2023.4.1 --- pkgs/tools/misc/esphome/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 46113ba0769c..81c6bf5cea4a 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.4.0"; + version = "2023.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-u3EQ2ZE6Yfa5M7lr0dULztTf4bGj6XEkta1LcTZCR50="; + hash = "sha256-XnsEidB/rqpiDABLMHHYX7ZMzyXi9OuAnyNFQAmLojA="; }; postPatch = '' @@ -97,6 +97,7 @@ python.pkgs.buildPythonApplication rec { }; meta = with lib; { + changelog = "https://github.com/esphome/esphome/releases/tag/${version}"; description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; license = with licenses; [ From feb8918934531e87891f83bfdfa55e887021d48e Mon Sep 17 00:00:00 2001 From: Simone Ruffini Date: Thu, 13 Apr 2023 13:21:28 +0200 Subject: [PATCH 007/182] savvycan: init at 208 Apply suggestions from code review Co-authored-by: Francesco Gazzetta SavvyCAN: fix typo in default.nix Update pkgs/applications/networking/sniffers/savvycan/default.nix Co-authored-by: Francesco Gazzetta Apply suggestions from code review Co-authored-by: Francesco Gazzetta fix: style --- .../networking/sniffers/savvycan/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/applications/networking/sniffers/savvycan/default.nix diff --git a/pkgs/applications/networking/sniffers/savvycan/default.nix b/pkgs/applications/networking/sniffers/savvycan/default.nix new file mode 100644 index 000000000000..b9d791603fce --- /dev/null +++ b/pkgs/applications/networking/sniffers/savvycan/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, qtbase +, qttools +, qmake +, qtserialbus +, qtserialport +, qtdeclarative +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + + pname = "savvycan"; + version = "208"; + + src = fetchFromGitHub { + owner = "collin80"; + repo = "SavvyCAN"; + rev = "V${version}"; + hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw="; + }; + + buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + meta = with lib; { + description = "QT based cross platform canbus tool"; + homepage = "https://savvycan.com/"; + changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}"; + maintainers = with maintainers; [ simoneruffini ]; + platforms = platforms.all; + license = licenses.mit; + mainProgram = "SavvyCAN"; + longDescription = '' + SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse + engineering and capture tool. It was originally written to utilize EVTV + hardware such as the EVTVDue and CANDue hardware. It has since expanded to be + able to use any socketCAN compatible device as well as the Macchina M2 and + Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's + SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and + send to multiple buses and CAN capture devices at once. It has many functions + specifically meant for reverse engineering data found on the CAN bus: + - Ability to capture even very highly loaded buses + - Ability to connect to many dongles simultaneously + - Scan captured traffic for data that looks coherent + - Show ASCII of captured data to find things like VIN numbers and traffic to + and from the radio + - Graph data found on the bus + - Load and Save many different file formats common to CAN capture tools (Vector + captures, Microchip, CANDo, PCAN, and many more) + - Load and Save DBC files. DBC files are used to store definitions for how data + are formatted on the bus. You can turn the raw data into things like a RPM, + odometer readings, and more. + - UDS scanning and decoding + - Scripting interface to be able to expand the scope of the software + - Best of all, it's free and open source. Don't like something about it? Change + it! + ''; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 189bbc677e86..48b9a5defd28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33453,6 +33453,8 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; + savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {}; + sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; From 1dbfe290ee2a50d8a54e06ab4f664a59b476e864 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Apr 2023 20:34:25 +0000 Subject: [PATCH 008/182] libmtp: fix cross --- pkgs/development/libraries/libmtp/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 4ca15f01a6d3..ff6f889ee3e9 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -2,12 +2,14 @@ , autoconf , automake , fetchFromGitHub +, fetchpatch , gettext , lib , libiconv , libtool , libusb1 , pkg-config +, buildPackages }: stdenv.mkDerivation rec { @@ -21,6 +23,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA="; }; + patches = [ + # Backport cross fix. + (fetchpatch { + url = "https://github.com/libmtp/libmtp/commit/467fa26e6b14c0884b15cf6d191de97e5513fe05.patch"; + sha256 = "2DrRrdcguJ9su4LxtT6YOjer8gUTxIoHVpk+6M9P4cg="; + }) + ]; + outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ @@ -41,6 +51,10 @@ stdenv.mkDerivation rec { configurePlatforms = [ "build" "host" ]; + makeFlags = lib.optionals (stdenv.isLinux && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "MTP_HOTPLUG=${buildPackages.libmtp}/bin/mtp-hotplug" + ]; + enableParallelBuilding = true; meta = with lib; { From cdcefcacd3eb747119a45a69173f3a7d745fff88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 07:57:24 +0000 Subject: [PATCH 009/182] grafana-image-renderer: 3.6.4 -> 3.7.0 --- pkgs/servers/monitoring/grafana-image-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e356b914c39c..9d8c155cbb1a 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -12,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-CWA2xmVWvPeKCvssQAMHMYJ3CxJ7sIC7GX3qb3QFLuA="; + sha256 = "sha256-kbL6I2aFHyCmBiB1x02e3H7wIO4TE8ty6vHJEu/T8fI="; }; buildPhase = '' From caa3cce681e10362c19f681c7a4685f8eee560ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 Apr 2023 10:54:08 +0200 Subject: [PATCH 010/182] evcc: 0.116.3 -> 0.116.4 https://github.com/evcc-io/evcc/releases/tag/0.116.4 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index dcbf21fffe6f..9cd13ddd4c37 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo120Module +, buildGoModule , fetchFromGitHub , fetchNpmDeps , cacert @@ -14,15 +14,15 @@ , stdenv }: -buildGo120Module rec { +buildGoModule rec { pname = "evcc"; - version = "0.116.3"; + version = "0.116.4"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-w4AExQmItvSbUSGBOnoyP4rGnEYsyFUU9Y+lF+0xGVc="; + hash = "sha256-zNTDqokPjPtgBXEy81c1gl2WsbBf9FehJ5y75cYVlQ8="; }; vendorHash = "sha256-lu6/tRf9o0n13lVsT9OBxc6Ytz3IVEE16vLZ+pZ4Czk="; From 13e8808cd0ce469bd78fdbcf6594a267ea4656c5 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Tue, 25 Apr 2023 14:44:50 -0700 Subject: [PATCH 011/182] python3Packages.wandb: 0.13.9 -> 0.15.0 --- .../python-modules/wandb/default.nix | 179 +++++++++++++----- 1 file changed, 134 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index b38236170f05..462eb2e7a8ca 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -3,6 +3,7 @@ , appdirs , azure-core , bokeh +, boto3 , buildPythonPackage , click , docker_pycreds @@ -10,12 +11,19 @@ , flask , git , gitpython +, google-cloud-compute +, google-cloud-storage +, hypothesis , jsonref , jsonschema +, keras +, kubernetes , matplotlib +, mlflow , nbclient , nbformat , pandas +, parameterized , pathtools , promise , protobuf @@ -26,21 +34,23 @@ , pytestCheckHook , pythonOlder , pythonRelaxDepsHook -, torch , pyyaml , requests +, responses , scikit-learn , sentry-sdk , setproctitle , setuptools , shortuuid , substituteAll +, tensorflow +, torch , tqdm }: buildPythonPackage rec { pname = "wandb"; - version = "0.13.9"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -49,7 +59,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI="; + hash = "sha256-UULsvvk9BsWUrJ8eD7uD2UnUJqmPrmjrJvCA7WRC/Cw="; }; patches = [ @@ -85,19 +95,29 @@ buildPythonPackage rec { nativeCheckInputs = [ azure-core bokeh + boto3 flask + google-cloud-compute + google-cloud-storage + hypothesis jsonref jsonschema + keras + kubernetes matplotlib + mlflow nbclient nbformat pandas + parameterized pydantic pytest-mock pytest-xdist pytestCheckHook - torch + responses scikit-learn + tensorflow + torch tqdm ]; @@ -111,49 +131,118 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. - "tests/unit_tests_old/test_cli.py" - "tests/unit_tests_old/test_data_types.py" - "tests/unit_tests_old/test_file_stream.py" - "tests/unit_tests_old/test_file_upload.py" - "tests/unit_tests_old/test_footer.py" - "tests/unit_tests_old/test_internal_api.py" - "tests/unit_tests_old/test_keras.py" - "tests/unit_tests_old/test_logging.py" - "tests/unit_tests_old/test_metric_internal.py" - "tests/unit_tests_old/test_public_api.py" - "tests/unit_tests_old/test_runtime.py" - "tests/unit_tests_old/test_sender.py" - "tests/unit_tests_old/test_summary.py" - "tests/unit_tests_old/test_tb_watcher.py" - "tests/unit_tests_old/test_time_resolution.py" - "tests/unit_tests_old/test_wandb.py" - "tests/unit_tests_old/test_wandb_agent.py" - "tests/unit_tests_old/test_wandb_artifacts.py" - "tests/unit_tests_old/test_wandb_integration.py" - "tests/unit_tests_old/test_wandb_run.py" - "tests/unit_tests/test_cli.py" - "tests/unit_tests/test_data_types.py" - "tests/unit_tests/test_file_upload.py" - "tests/unit_tests/test_footer.py" - "tests/unit_tests/test_internal_api.py" - "tests/unit_tests/test_label_full.py" - "tests/unit_tests/test_login.py" - "tests/unit_tests/test_metric_full.py" - "tests/unit_tests/test_metric_internal.py" - "tests/unit_tests/test_mode_disabled.py" - "tests/unit_tests/test_model_workflows.py" - "tests/unit_tests/test_mp_full.py" - "tests/unit_tests/test_plots.py" - "tests/unit_tests/test_public_api.py" - "tests/unit_tests/test_runtime.py" - "tests/unit_tests/test_sender.py" - "tests/unit_tests/test_start_method.py" - "tests/unit_tests/test_tb_watcher.py" - "tests/unit_tests/test_telemetry_full.py" - "tests/unit_tests/test_util.py" + "tests/pytest_tests/unit_tests_old/test_cli.py" + "tests/pytest_tests/unit_tests_old/test_data_types.py" + "tests/pytest_tests/unit_tests_old/test_file_stream.py" + "tests/pytest_tests/unit_tests_old/test_file_upload.py" + "tests/pytest_tests/unit_tests_old/test_footer.py" + "tests/pytest_tests/unit_tests_old/test_internal_api.py" + "tests/pytest_tests/unit_tests_old/test_keras.py" + "tests/pytest_tests/unit_tests_old/test_logging.py" + "tests/pytest_tests/unit_tests_old/test_metric_internal.py" + "tests/pytest_tests/unit_tests_old/test_public_api.py" + "tests/pytest_tests/unit_tests_old/test_runtime.py" + "tests/pytest_tests/unit_tests_old/test_sender.py" + "tests/pytest_tests/unit_tests_old/test_summary.py" + "tests/pytest_tests/unit_tests_old/test_tb_watcher.py" + "tests/pytest_tests/unit_tests_old/test_time_resolution.py" + "tests/pytest_tests/unit_tests_old/test_wandb_agent.py" + "tests/pytest_tests/unit_tests_old/test_wandb_artifacts.py" + "tests/pytest_tests/unit_tests_old/test_wandb_integration.py" + "tests/pytest_tests/unit_tests_old/test_wandb_run.py" + "tests/pytest_tests/unit_tests_old/test_wandb.py" + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py" + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py" + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py" + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_kubernetes.py" + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py" + "tests/pytest_tests/unit_tests_old/tests_s_nb/test_notebooks.py" + "tests/pytest_tests/unit_tests/test_cli.py" + "tests/pytest_tests/unit_tests/test_data_types.py" + "tests/pytest_tests/unit_tests/test_internal_api.py" + "tests/pytest_tests/unit_tests/test_mode_disabled.py" + "tests/pytest_tests/unit_tests/test_model_workflows.py" + "tests/pytest_tests/unit_tests/test_plots.py" + "tests/pytest_tests/unit_tests/test_public_api.py" + "tests/pytest_tests/unit_tests/test_sender.py" + "tests/pytest_tests/unit_tests/test_util.py" + "tests/pytest_tests/unit_tests/test_wandb_verify.py" + + # Requires docker access + "tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py" + "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py" + "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py" + "tests/pytest_tests/system_tests/test_core/test_cli_full.py" + "tests/pytest_tests/system_tests/test_core/test_data_types_full.py" + "tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py" + "tests/pytest_tests/system_tests/test_core/test_file_upload.py" + "tests/pytest_tests/system_tests/test_core/test_footer.py" + "tests/pytest_tests/system_tests/test_core/test_keras_full.py" + "tests/pytest_tests/system_tests/test_core/test_label_full.py" + "tests/pytest_tests/system_tests/test_core/test_metric_full.py" + "tests/pytest_tests/system_tests/test_core/test_metric_internal.py" + "tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py" + "tests/pytest_tests/system_tests/test_core/test_model_workflow.py" + "tests/pytest_tests/system_tests/test_core/test_mp_full.py" + "tests/pytest_tests/system_tests/test_core/test_public_api.py" + "tests/pytest_tests/system_tests/test_core/test_redir_full.py" + "tests/pytest_tests/system_tests/test_core/test_report_api.py" + "tests/pytest_tests/system_tests/test_core/test_runtime.py" + "tests/pytest_tests/system_tests/test_core/test_save_policies.py" + "tests/pytest_tests/system_tests/test_core/test_sender.py" + "tests/pytest_tests/system_tests/test_core/test_start_method.py" + "tests/pytest_tests/system_tests/test_core/test_system_info.py" + "tests/pytest_tests/system_tests/test_core/test_tb_watcher.py" + "tests/pytest_tests/system_tests/test_core/test_telemetry_full.py" + "tests/pytest_tests/system_tests/test_core/test_time_resolution.py" + "tests/pytest_tests/system_tests/test_core/test_torch_full.py" + "tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py" + "tests/pytest_tests/system_tests/test_core/test_wandb_integration.py" + "tests/pytest_tests/system_tests/test_core/test_wandb_run.py" + "tests/pytest_tests/system_tests/test_core/test_wandb_settings.py" + "tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py" + "tests/pytest_tests/system_tests/test_core/test_wandb_verify.py" + "tests/pytest_tests/system_tests/test_core/test_wandb.py" + "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py" + "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" + "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" + "tests/pytest_tests/system_tests/tests_launch/test_github_reference.py" + "tests/pytest_tests/system_tests/tests_launch/test_job.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_add.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_cli.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_kubernetes.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_local_container.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_run.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch_sweep.py" + "tests/pytest_tests/system_tests/tests_launch/test_launch.py" + "tests/pytest_tests/system_tests/tests_launch/test_wandb_reference.py" # Tries to access /homeless-shelter - "tests/unit_tests/test_tables.py" + "tests/pytest_tests/unit_tests/test_tables.py" + + # E AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' + # E + where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = .output + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py" + + # Requires google-cloud-aiplatform which is not packaged as of 2023-04-25. + "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_gcp.py" + + # Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25. + "tests/pytest_tests/unit_tests_old/tests_launch/test_kaniko_build.py" + "tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py" + + # Requires kfp which is not packaged as of 2023-04-25. + "tests/pytest_tests/system_tests/test_core/test_kfp.py" + + # Requires metaflow which is not packaged as of 2023-04-25. + "tests/pytest_tests/unit_tests/test_metaflow.py" + + # See https://github.com/wandb/wandb/issues/5423 + "tests/pytest_tests/unit_tests/test_docker.py" + "tests/pytest_tests/unit_tests/test_library_public.py" ]; # Disable test that fails on darwin due to issue with python3Packages.psutil: From 449fde8a09f336726f314a13e95e5951e444a2f4 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Tue, 25 Apr 2023 17:17:53 -0600 Subject: [PATCH 012/182] nixos(steam): add gamescope session option --- nixos/modules/programs/gamescope.nix | 3 +- nixos/modules/programs/steam.nix | 61 ++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/gamescope.nix b/nixos/modules/programs/gamescope.nix index ac2c7db0237d..c4424849a41e 100644 --- a/nixos/modules/programs/gamescope.nix +++ b/nixos/modules/programs/gamescope.nix @@ -36,7 +36,8 @@ in type = types.bool; default = false; description = mdDoc '' - Add cap_sys_nice capability to the GameScope binary. + Add cap_sys_nice capability to the GameScope + binary so that it may renice itself. ''; }; diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index fc63f0f187e8..28985b8db17c 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -4,6 +4,24 @@ with lib; let cfg = config.programs.steam; + gamescopeCfg = config.programs.gamescope; + + steam-gamescope = let + exports = builtins.attrValues (builtins.mapAttrs (n: v: "export ${n}=${v}") cfg.gamescopeSession.env); + in + pkgs.writeShellScriptBin "steam-gamescope" '' + ${builtins.concatStringsSep "\n" exports} + gamescope --steam ${toString cfg.gamescopeSession.args} -- steam -tenfoot -pipewire-dmabuf + ''; + + gamescopeSessionFile = + (pkgs.writeTextDir "share/wayland-sessions/steam.desktop" '' + [Desktop Entry] + Name=Steam + Comment=A digital distribution platform + Exec=${steam-gamescope}/bin/steam-gamescope + Type=Application + '').overrideAttrs (_: { passthru.providedSessions = [ "steam" ]; }); in { options.programs.steam = { enable = mkEnableOption (lib.mdDoc "steam"); @@ -32,6 +50,12 @@ in { then [ package ] ++ extraPackages else [ package32 ] ++ extraPackages32; in prevLibs ++ additionalLibs; + } // optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) + { + buildFHSEnv = pkgs.buildFHSEnv.override { + # use the setuid wrapped bubblewrap + bubblewrap = "${config.security.wrapperDir}/.."; + }; }); description = lib.mdDoc '' The Steam package to use. Additional libraries are added from the system @@ -57,6 +81,30 @@ in { Open ports in the firewall for Source Dedicated Server. ''; }; + + gamescopeSession = mkOption { + description = mdDoc "Run a GameScope driven Steam session from your display-manager"; + type = types.submodule { + options = { + enable = mkEnableOption (mdDoc "GameScope Session"); + args = mkOption { + type = types.listOf types.string; + default = [ ]; + description = mdDoc '' + Arguments to be passed to GameScope for the session. + ''; + }; + + env = mkOption { + type = types.attrsOf types.string; + default = { }; + description = mdDoc '' + Environmental variables to be passed to GameScope for the session. + ''; + }; + }; + }; + }; }; config = mkIf cfg.enable { @@ -66,6 +114,19 @@ in { driSupport32Bit = true; }; + security.wrappers = mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) { + # needed or steam fails + bwrap = { + owner = "root"; + group = "root"; + source = "${pkgs.bubblewrap}/bin/bwrap"; + setuid = true; + }; + }; + + programs.gamescope.enable = mkDefault cfg.gamescopeSession.enable; + services.xserver.displayManager.sessionPackages = mkIf cfg.gamescopeSession.enable [ gamescopeSessionFile ]; + # optionally enable 32bit pulseaudio support if pulseaudio is enabled hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable; From d9a5d373b97981efc2428188c3bf3dbc7369b7a1 Mon Sep 17 00:00:00 2001 From: gp2112 Date: Wed, 26 Apr 2023 00:46:30 -0300 Subject: [PATCH 013/182] signal-desktop: 6.15.0 -> 6.16.0; signal-desktop-beta: 6.16.0-beta.1 -> 6.17.0-beta.1 --- .../instant-messengers/signal-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a697cb7afed0..8d2a74f641cc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.15.0"; - hash = "sha256-uZXFnbDe49GrjKm4A0lsOTGV8Xqg0+oC0+AwRMKykfY="; + version = "6.16.0"; + hash = "sha256-q7z7TS16RORPbEMJBEmF3m2q4IdD3dM1xqv1DfgM9Zs="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.16.0-beta.1"; - hash = "sha256-J7YPuQetfob8Ybab+c5W0Z4Urzi4AtEJAnIVRIGtv0Q="; + version = "6.17.0-beta.1"; + hash = "sha256-8Ae+IrwDRxcF5JhrDqEhimQqyCtDYWm/pOrcpKgAo2w="; }; } From 8576682e8f07314e43c4cb2c12ee052090796503 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 26 Apr 2023 04:20:00 +0000 Subject: [PATCH 014/182] bazel-buildtools: 6.1.0 -> 6.1.1 https://github.com/bazelbuild/buildtools/releases/tag/6.1.1 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e21e9dd5a7a6..2f35d730c748 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.1.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - hash = "sha256-yqRvmVy5KRVURsRanLXT1tQvbIaib8UZrO4cLEQNlc0="; + hash = "sha256-CqQ8rj45RES3BV7RBfGr/JX9GzjyRuA1sxgKzQx+oE8="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; From 38f41a27b4eadf2eaf0e9913f266bc6a49a3cdaf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 26 Apr 2023 00:02:00 -0700 Subject: [PATCH 015/182] stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause The comment stating that "GCC has certain things built in statically" is no longer true as of https://github.com/NixOS/nixpkgs/pull/209870. Moreover, as pointed out in https://github.com/NixOS/nixpkgs/pull/228130 this optionalString block no longer builds for pkgsCross.*.freshBootstrapTools. It is safe to drop this clause now. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 091130ebf93a..d6815093d457 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -158,12 +158,6 @@ in with pkgs; rec { cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # These needed for cross but not native tools because the stdenv - # GCC has certain things built in statically. See - # pkgs/stdenv/linux/default.nix for the details. - cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib - '' + lib.optionalString (stdenv.hostPlatform.isRiscV) '' # libatomic is required on RiscV platform for C/C++ atomics and pthread # even though they may be translated into native instructions. From 19b7602cbdff802a3f3950fdc30092790c6f5e5f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:48:33 +0300 Subject: [PATCH 016/182] rPackages.textshaping: fix build on darwin --- pkgs/development/r-modules/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index aa7014cf4452..b5f18f6237b7 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1336,6 +1336,10 @@ let rhdf5= old.rhdf5.overrideAttrs (attrs: { patches = [ ./patches/rhdf5.patch ]; }); + + textshaping = old.textshaping.overrideAttrs (attrs: { + env.NIX_LDFLAGS = "-lfribidi -lharfbuzz"; + }); }; in self From 56344717c0d339678e929681acd4f45e712b4858 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 08:47:24 +0000 Subject: [PATCH 017/182] python310Packages.mkdocs-swagger-ui-tag: 0.5.2 -> 0.6.1 --- .../python-modules/mkdocs-swagger-ui-tag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index cb2f6979db5c..5b94eb230cc4 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.5.2"; + version = "0.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-qurnqgpsppO4LPg8fN6HobUoNHQTDI6OmEDjVtObA78="; + hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; From 99fdc9f8b3a8febd8260486aaf101f050345ffd1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 10:44:58 +0000 Subject: [PATCH 018/182] qxmpp: 1.5.3 -> 1.5.4 --- pkgs/development/libraries/qxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/development/libraries/qxmpp/default.nix index 6f6b578cc412..31a588823cd6 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/development/libraries/qxmpp/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h2MBs46E2dvwOhs1cnSvrMll3nZSE9o4oEZV2Bd1Yh0="; + sha256 = "sha256-4MDP2OQK1fjlG74y396CSLt7s+QScWBqlms4aqLIC3s="; }; nativeBuildInputs = [ From e53999d698f51d62edfe552ecc474b2eb3e8a559 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Apr 2023 18:48:43 +0800 Subject: [PATCH 019/182] =?UTF-8?q?gnome.mutter43:=2043.4=20=E2=86=92=2043?= =?UTF-8?q?.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can drop our downstream patch thanks to https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2955 https://gitlab.gnome.org/GNOME/mutter/-/compare/43.4...43.5 --- .../desktops/gnome/core/mutter/43/default.nix | 12 ++------- .../core/mutter/43/glib-2-76-gala-crash.patch | 25 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix index 5953d00de45f..318c12a9ebdb 100644 --- a/pkgs/desktops/gnome/core/mutter/43/default.nix +++ b/pkgs/desktops/gnome/core/mutter/43/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "43.4"; + version = "43.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA="; + sha256 = "/JAP4ahA2aeTyOLSDUTJCqCH1fv9x5Su5wluHYoJZxo="; }; patches = [ @@ -66,14 +66,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; }) - - # GLib 2.76 switches from using its own slice allocator to using the system malloc instead. - # This makes dragging window between workspace in multitasking view crashes Pantheon's Gala. - # Inspiration https://github.com/mate-desktop/mate-desktop/pull/538 - # Backtrace https://github.com/elementary/gala/issues/1580 - # Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495 - # The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up. - ./glib-2-76-gala-crash.patch ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch b/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch deleted file mode 100644 index 895cabcdbdb4..000000000000 --- a/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index d34c8f59f..8835a6a33 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor *self, - ClutterEventPhase phase) - { - ClutterActorPrivate *priv; -- const GList *actions, *l; -+ const GList *actions, *l, *next; - gboolean retval = CLUTTER_EVENT_PROPAGATE; - - priv = self->priv; -@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor *self, - - actions = _clutter_meta_group_peek_metas (priv->actions); - -- for (l = actions; l; l = l->next) -+ for (l = actions; l; l = next) - { - ClutterAction *action = l->data; -+ next = l->next; - ClutterEventPhase action_phase; - - action_phase = clutter_action_get_phase (action); From 0d5c93e19f34515bf374049e5835ccdbfefbbd8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 10:52:03 +0000 Subject: [PATCH 020/182] opengrok: 1.11.5 -> 1.12.0 --- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index e5c7f47ea8f7..56a5fa5c58f5 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.11.5"; + version = "1.12.0"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-HjWO4Ucd8RpB6r1P1PQ866DEkCQVQE4VpYmzun8jMhM="; + hash = "sha256-a+iDY00cqtDm1Bm4nclbW/vRpeqWVAjAlBbKS+SC9Us="; }; nativeBuildInputs = [ makeWrapper ]; From 0448f7815ec3e245896ae115ce99c46a5fad5f09 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 26 Apr 2023 18:54:36 +0800 Subject: [PATCH 021/182] amberol: 0.10.0 -> 0.10.1 --- pkgs/applications/audio/amberol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index a4acc2844b89..9f0b04fbec11 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-G1B+kDH1eWYA/j1t2xJPoGQasIJ77y+BKnnu/6VEWts="; + hash = "sha256-pvvpiZHp3Gj3rtjvlnfmC2E0mcmh0/poxidhJC8j4Cg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-5hy2u1flUKZCM4OPFhoT5b3R8v3zBGtwN+e6kwY3LQ4="; + hash = "sha256-eb4vVgSAvR2LYVmZmdOIoXxJqFz6q78PIoQPVrOIffc="; }; postPatch = '' From 71728de8148073bf37c9eb918618457cfe493644 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 13:03:45 +0200 Subject: [PATCH 022/182] python310Packages.mkdocs-swagger-ui-tag: update meta --- .../python-modules/mkdocs-swagger-ui-tag/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 5b94eb230cc4..31168c5370cf 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -23,8 +23,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ]; meta = with lib; { - description = "A MkDocs plugin supports for add Swagger UI in page."; + description = "A MkDocs plugin supports for add Swagger UI in page"; homepage = "https://github.com/Blueswen/mkdocs-swagger-ui-tag"; + changelog = "https://github.com/blueswen/mkdocs-swagger-ui-tag/blob/v${version}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ snpschaaf ]; }; From c176f0a52de467eabf0e2382d4b14d3f80d75486 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 13:06:02 +0200 Subject: [PATCH 023/182] python310Packages.mkdocs-swagger-ui-tag: update disabled - add format --- .../mkdocs-swagger-ui-tag/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 31168c5370cf..d4c3690b4765 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -1,8 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , drawio-headless , fetchPypi -, isPy3k -, lib +, pythonOlder , mkdocs , beautifulsoup4 }: @@ -10,17 +10,23 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; version = "0.6.1"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw="; }; - propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; + propagatedBuildInputs = [ + mkdocs + beautifulsoup4 + ]; - pythonImportsCheck = [ "mkdocs_swagger_ui_tag" ]; + pythonImportsCheck = [ + "mkdocs_swagger_ui_tag" + ]; meta = with lib; { description = "A MkDocs plugin supports for add Swagger UI in page"; From d0d211ad55a6f41e61bcbf1e6cded02c3e9cb44a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 12:22:00 +0000 Subject: [PATCH 024/182] cargo-chef: 0.1.56 -> 0.1.59 --- pkgs/development/tools/rust/cargo-chef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 47af138388ae..49cf24c838ee 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.56"; + version = "0.1.59"; src = fetchCrate { inherit pname version; - sha256 = "sha256-WsK4hdV20IcG2bF8LumeII8e91330zCtR0+A3EPYtAk="; + sha256 = "sha256-96KfjxpFw1uNejN917KMX98zxzJmozMiS99Aex2w4tM="; }; - cargoHash = "sha256-L/4m47TJHGSOC8/94qnjea5Febck7RtPaVVYi4/Pn5s="; + cargoHash = "sha256-t4MuazMC8VJLj2SwY/crkd2W/ioRkdjvL5ZWiCp+7tE="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; From a1377d938451ac320ccd8f3e56037c02a0caa7ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 14:17:09 +0000 Subject: [PATCH 025/182] fatsort: 1.6.4.625 -> 1.6.5.640 --- pkgs/tools/filesystems/fatsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 2ca135704e0c..ef7111dd72ff 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.6.4.625"; + version = "1.6.5.640"; pname = "fatsort"; src = fetchurl { url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; - sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0="; + sha256 = "sha256-Yw7OVtnrOlVSSvCuw6reeFQ2DrqUkXKmz7R2jLj75C4="; }; buildInputs = [ help2man libiconv ]; From edfc946b040e27f22ea3254d2b414c2b1b2e0292 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 26 Apr 2023 16:28:19 +0200 Subject: [PATCH 026/182] xcaddy: 0.3.2 -> 0.3.3 https://github.com/caddyserver/xcaddy/releases/tag/v0.3.3 diff: https://github.com/caddyserver/xcaddy/compare/v0.3.2...v0.3.3 --- pkgs/servers/caddy/xcaddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index c20a0e325ec9..952261703a3e 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "xcaddy"; - version = "0.3.2"; + version = "0.3.3"; subPackages = [ "cmd/xcaddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs="; + hash = "sha256-HDyHvHa8yCz59AifHxQ0LAuC/xPXQInuUYURx7bL3oE="; }; patches = [ From 9bf9c5032bee6b48849dd9a88a5d11fc4b054699 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 26 Apr 2023 10:29:57 -0400 Subject: [PATCH 027/182] cargo-binstall: 0.22.0 -> 0.23.0 Diff: https://github.com/cargo-bins/cargo-binstall/compare/v0.22.0...v0.23.0 Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v0.23.0 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 1e5252b13610..6c972a68a563 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-jY5mIbrcX2B0D6ezi1k0mcRAmrSPIoebJFHn3lZ2t9w="; + hash = "sha256-PB7EZMJ9wXVneLTc8wiZVxeyE/XybuwUvcVkN6q04lo="; }; - cargoHash = "sha256-+O/+zsiG0wyNKp/2TP5I8EPMf6YPT8VtCD4BXI76J7Q="; + cargoHash = "sha256-SxQSzY31m3eTDO38jRpvzwmV9d6puIZ3DwBlC2Zb4b0="; nativeBuildInputs = [ pkg-config From c1321cf04e361cb07acc7e8cda3f8a9c650aeb73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 15:15:58 +0000 Subject: [PATCH 028/182] python310Packages.zigpy-zigate: 0.10.3 -> 0.11.0 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 16228f53861a..77ac66638b78 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.10.3"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = "refs/tags/v${version}"; - hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY="; + rev = "refs/tags/${version}"; + hash = "sha256-eGN2QvPHZ8gfPPFdUbAP9cs43jzUHDBS/w1tni1shB0="; }; propagatedBuildInputs = [ From 7bbf9bfc3867a619e342df8608b81c07ac80b1dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 15:42:02 +0000 Subject: [PATCH 029/182] python310Packages.azure-mgmt-imagebuilder: 1.1.0 -> 1.2.0 --- .../python-modules/azure-mgmt-imagebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 8b92d97dd2dc..c8aadd1f4d6a 100644 --- a/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; + hash = "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI="; extension = "zip"; }; From fc490fffe6637d6d928226cf37ac9a34c20790ea Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:17 +0200 Subject: [PATCH 030/182] linux: 4.14.313 -> 4.14.314 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f13198ce00df..24fd30006d65 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.313"; + version = "4.14.314"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76"; + sha256 = "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47"; }; } // (args.argsOverride or {})) From 59c26aa791bb0bef9c2ae27b5c652a00e07fd669 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:27 +0200 Subject: [PATCH 031/182] linux: 4.19.281 -> 4.19.282 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c6a13a9378f6..defd77d4eef3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.281"; + version = "4.19.282"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0"; + sha256 = "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3"; }; } // (args.argsOverride or {})) From 1bb2f9aac306aa96346b19002ae74f888a6d3c58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:38 +0200 Subject: [PATCH 032/182] linux: 5.10.178 -> 5.10.179 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 9a82437cecaa..39b5b0ff503b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.178"; + version = "5.10.179"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs"; + sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v"; }; } // (args.argsOverride or {})) From 81bc93e6d121faa702dc004eeb50c93be997f07d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:49 +0200 Subject: [PATCH 033/182] linux: 5.15.108 -> 5.15.109 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 548693211864..61497c74fd00 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.108"; + version = "5.15.109"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb"; + sha256 = "06kpqpmbp4gpsx1yqcznmbn41wq82wmza0p3l9l00j1wpsy4nv06"; }; } // (args.argsOverride or { })) From d9487020e9c92ababbe6236ce7dd52304a7ba15f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:15:59 +0200 Subject: [PATCH 034/182] linux: 5.4.241 -> 5.4.242 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 6ffd5ae0db26..8dc848104639 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.241"; + version = "5.4.242"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z"; + sha256 = "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql"; }; } // (args.argsOverride or {})) From 3f8dd842b6c5b1aab5c71ad9feb7acb86cd8e15b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:11 +0200 Subject: [PATCH 035/182] linux: 6.1.25 -> 6.1.26 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index 8d598f812215..002d2eadff20 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.25"; + version = "6.1.26"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb"; + sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z"; }; # TODO: possible to remove after any rebuild, e.g. after update. extraConfig = lib.optionalString (buildPackages.stdenv.system == "x86_64-linux") "\n"; From 7a97895091ad5ae3e435291dbadfe76db868c94c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:23 +0200 Subject: [PATCH 036/182] linux: 6.2.12 -> 6.2.13 --- pkgs/os-specific/linux/kernel/linux-6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 3141e37b237f..68aa7e9aecf0 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.12"; + version = "6.2.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1j6cn1ifmcqfqvxp9h10y8yfxi918yzl3yjbf96gmb9p4ysldqf7"; + sha256 = "0xz507nzslgidq7pwnfnsawvrn30apv4mmiapcc4p0v8wcafvpf7"; }; } // (args.argsOverride or { })) From 9af09ebb3d80fe0c7e9c289ad9fec05de942c940 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:16:49 +0200 Subject: [PATCH 037/182] linux_latest-libre: 19172 -> 19204 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 60838e20b826..1e1382f86a42 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19172"; - sha256 = "18r6p1zg7af7vpij1kna2i2w82xb0c8qrbbr9bfz6bcj8fqv8l2z"; + rev = "19204"; + sha256 = "1cxg2bslskjby11mxqv71w701217i1s9yj73ih3hjzxs6hkv9r0v"; } , ... }: From 857a4a111f4e2b46900298a5fb09c820b09b03e3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:17:40 +0200 Subject: [PATCH 038/182] linux/hardened/patches/4.14: 4.14.312-hardened1 -> 4.14.313-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d821d72dae00..d6ce79ae712a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.312-hardened1.patch", - "sha256": "1ysbbd43zgh1zbk99kpzwwa42ywprj2j4bwy87l58vlwcd2xf53r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.312-hardened1/linux-hardened-4.14.312-hardened1.patch" + "name": "linux-hardened-4.14.313-hardened1.patch", + "sha256": "0qpf9chiydj6dcka1lf6qdx462wq0salxac3kkl32l33karax292", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.313-hardened1/linux-hardened-4.14.313-hardened1.patch" }, - "sha256": "03bwrnm7z8jxxn681dd5jffrj76l14ngkcccfgbg1p4a0471q436", - "version": "4.14.312" + "sha256": "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76", + "version": "4.14.313" }, "4.19": { "patch": { From 44167600c6306e660d6664f55fa551753875089c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:17:52 +0200 Subject: [PATCH 039/182] linux/hardened/patches/4.19: 4.19.280-hardened1 -> 4.19.281-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d6ce79ae712a..ffc199efa075 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.280-hardened1.patch", - "sha256": "0ayl7hcwf4j763gqzrd79kp7cyq7m5v6ar6znfi57ssqdrwq494l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.280-hardened1/linux-hardened-4.19.280-hardened1.patch" + "name": "linux-hardened-4.19.281-hardened1.patch", + "sha256": "0qhf0835zwmj0z2654bhyc6zww68g8ng4ghg5ivw2zcfv6yssv17", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.281-hardened1/linux-hardened-4.19.281-hardened1.patch" }, - "sha256": "1xmg9p3ky75n5q894f522s8nwcmbd5c15nmjr0n96m6xzag3kd7w", - "version": "4.19.280" + "sha256": "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0", + "version": "4.19.281" }, "5.10": { "patch": { From 7a21026a95b484a75a0c865a56ccd5dfc0259edc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:04 +0200 Subject: [PATCH 040/182] linux/hardened/patches/5.10: 5.10.177-hardened1 -> 5.10.178-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ffc199efa075..0f775abee218 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.177-hardened1.patch", - "sha256": "19ic849ph32nca206ngcf11v52k60z4lwyssaqdnhbikv3z1zpfj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.177-hardened1/linux-hardened-5.10.177-hardened1.patch" + "name": "linux-hardened-5.10.178-hardened1.patch", + "sha256": "142ym9z6c9bcq2hpv2ik6xsjlvyyvw3vx8ggp4a67zwv6apg48v3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.178-hardened1/linux-hardened-5.10.178-hardened1.patch" }, - "sha256": "0waml6svj07b7f8yb1kzrflqlf61x4kcqbgsr372s484m3z628lz", - "version": "5.10.177" + "sha256": "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs", + "version": "5.10.178" }, "5.15": { "patch": { From 1c41b1af7c4f67145bcc3c401ee50a1f6da96898 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:17 +0200 Subject: [PATCH 041/182] linux/hardened/patches/5.15: 5.15.107-hardened1 -> 5.15.108-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0f775abee218..5b28679f4fd1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.107-hardened1.patch", - "sha256": "1rd0lh9jdr2jm3aa91cax6m2fkmnhx2994gqwcnp1mqsy0bi9yh9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.107-hardened1/linux-hardened-5.15.107-hardened1.patch" + "name": "linux-hardened-5.15.108-hardened1.patch", + "sha256": "1qfmx640b2s10q3sz0lcn1fsfbhklg8l4bzahrsdq6gkvsy9lyxn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.108-hardened1/linux-hardened-5.15.108-hardened1.patch" }, - "sha256": "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr", - "version": "5.15.107" + "sha256": "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb", + "version": "5.15.108" }, "5.4": { "patch": { From bfdb671cd53fb625b85fc071a36e35d06b0f772d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:29 +0200 Subject: [PATCH 042/182] linux/hardened/patches/5.4: 5.4.240-hardened1 -> 5.4.241-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 5b28679f4fd1..57356b99e6c0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.240-hardened1.patch", - "sha256": "0z64r2zs1swby2ws88xd1wy7dp83gamkk09asncc7k51zr9awraf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.240-hardened1/linux-hardened-5.4.240-hardened1.patch" + "name": "linux-hardened-5.4.241-hardened1.patch", + "sha256": "1nksqvc1ql42v92bfp26yyczvzslzl73mhnfc83j6cayqx8dw59z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.241-hardened1/linux-hardened-5.4.241-hardened1.patch" }, - "sha256": "0ihf0rqhx7dav3k3igk29962sscb1xyniy2gx8chyllprr0z126w", - "version": "5.4.240" + "sha256": "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z", + "version": "5.4.241" }, "6.1": { "patch": { From 3f02834f9027c8b1a15cb59c81ccfffff810b9c5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 26 Apr 2023 19:18:43 +0200 Subject: [PATCH 043/182] linux/hardened/patches/6.1: 6.1.24-hardened2 -> 6.1.25-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 57356b99e6c0..ae97f9dd60d1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -51,12 +51,12 @@ }, "6.1": { "patch": { - "extra": "-hardened2", - "name": "linux-hardened-6.1.24-hardened2.patch", - "sha256": "1bjcjq0gqvhknryq97qj1a6q3fi71pql23knvs0c42k4vknfih9q", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.24-hardened2/linux-hardened-6.1.24-hardened2.patch" + "extra": "-hardened1", + "name": "linux-hardened-6.1.25-hardened1.patch", + "sha256": "1s9fx4nznmabg7b19qm7nwhpgdvin4f2gxd8f27zh7anbv9na4x7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.25-hardened1/linux-hardened-6.1.25-hardened1.patch" }, - "sha256": "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma", - "version": "6.1.24" + "sha256": "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb", + "version": "6.1.25" } } From 20d084405356248e71f62b79a6c67901e5a7ab98 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 26 Apr 2023 11:33:30 -0600 Subject: [PATCH 044/182] matrix-synapse: 1.81.0 -> 1.82.0 https://github.com/matrix-org/synapse/releases/tag/v1.82.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 17adab07cf11..d55fbfe914c2 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.81.0"; + version = "1.82.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-zOpjJSzQNgWQy52GjwR1zy3oaMRTxP92T3hNaYhmcCs="; + hash = "sha256-j2lsdLYN5LqnIevUkD85i1XNIJa/Vpc1NHhIf2djlis="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-s/zq8VGBdIQu/Q/2gJrLFtZJ+lsTyK+2fr9RYhBTbKA="; + hash = "sha256-iEPfYZd8RWlG5z8BbzESD9O0QV60EBiIIaxm9skt8Uc="; }; postPatch = '' From b15a98560a0aaf59b9988c85954398783f0ca436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 17:34:16 +0000 Subject: [PATCH 045/182] python310Packages.returns: 0.19.0 -> 0.20.0 --- pkgs/development/python-modules/returns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index 5a5ce355feed..c9fcac37f932 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "returns"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-yKlW5M7LlK9xF4GiCKtUVrZwwSmFVjCnDhnzaNFcAsU="; + hash = "sha256-28WYjrjmu3hQ8+Snuvl3ykTd86eWYI97AE60p6SVwDQ="; }; nativeBuildInputs = [ From 2a088c0c0261d4a4dc026bc5ed01f4acc84cc5fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 20:22:26 +0200 Subject: [PATCH 046/182] python310Packages.zigpy-zigate: add changelog to meta --- pkgs/development/python-modules/zigpy-zigate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 77ac66638b78..4b11d35b6b7d 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -52,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library which communicates with ZiGate radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-zigate"; + changelog = "https://github.com/zigpy/zigpy-zigate/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; From 33a4803b3c023d0ffaf5b7a91097934950b57f67 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 26 Apr 2023 20:23:19 +0200 Subject: [PATCH 047/182] linux_xanmod: add shawn8901 as maintainer --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5fbce0534cf0..360daf0a4658 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -52,7 +52,7 @@ let extraMeta = { branch = lib.versions.majorMinor version; - maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu ]; + maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; From 665bc71e23ba826ad46b9686162269dc8dd38410 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 18:48:48 +0000 Subject: [PATCH 048/182] obs-studio-plugins.droidcam-obs: 2.0.1 -> 2.0.2 --- .../video/obs-studio/plugins/droidcam-obs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 131817a2589f..a1cf5f2e7eef 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "droidcam-obs"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; rev = version; - sha256 = "sha256-oaw/mq4WCQMlf3sv9WtNlv9J9rm79xnqDwKzHtyFW50="; + sha256 = "sha256-YtfWwgBhyQYx6QfrKld7p6qUf8BEV/kkQX4QcdHuaYU="; }; postPatch = '' From 973ced0339d0c9b03cca7bd2e75415325bb2f118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 18:49:49 +0000 Subject: [PATCH 049/182] snac2: 2.25 -> 2.28 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 7f2d6c774d07..e1a37f6c9aec 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.25"; + version = "2.28"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-xWRsJ1b2Ddf4H9KLIyc4GpRc6xUNFRQpIdgfrdPg/0c="; + hash = "sha256-VeywijUgLcSxaqlkFkZMqZQn2u2ZmCL1CcJ7eW+C9k4="; }; buildInputs = [ curl openssl ]; From 1b3c6848081aec70b21a08b644099421756bb0d9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 26 Apr 2023 21:20:06 +0200 Subject: [PATCH 050/182] linux-wifi-hotspot: Fix desktop file path --- pkgs/os-specific/linux/linux-wifi-hotspot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index e5e4e1dca87a..ca466d37634d 100644 --- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { --replace "etc" "$out/etc" substituteInPlace ./src/scripts/wihotspot \ --replace "/usr" "$out" + substituteInPlace ./src/desktop/wifihotspot.desktop \ + --replace "/usr" "$out" ''; makeFlags = [ From de64d9d6bfe1e99adc94b78ec6638f1d4fac6365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 19:22:17 +0000 Subject: [PATCH 051/182] python310Packages.schedule: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/schedule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 4aad4dc1abd4..da9825434bad 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4"; + sha256 = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0="; }; buildInputs = [ mock ]; From 8436c5fac4e2fd1d7ab8166cd8d17b82e57a3085 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 26 Apr 2023 21:30:35 +0200 Subject: [PATCH 052/182] linux-wifi-hotspot: Fix file paths in polkit rule --- pkgs/os-specific/linux/linux-wifi-hotspot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index ca466d37634d..7e45943aba4f 100644 --- a/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { --replace "/usr" "$out" substituteInPlace ./src/desktop/wifihotspot.desktop \ --replace "/usr" "$out" + substituteInPlace ./src/scripts/policies/polkit.policy \ + --replace "/usr" "$out" ''; makeFlags = [ From 26e6ad1c1a9b80acc63d9100b47771d65356d80c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 26 Apr 2023 21:46:39 +0200 Subject: [PATCH 053/182] sony-headphones-client: 1.3.1 -> 1.3.2 --- pkgs/applications/audio/sony-headphones-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix index c4491cd2a0dc..72d22e9fb7e4 100644 --- a/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/pkgs/applications/audio/sony-headphones-client/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "SonyHeadphonesClient"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Plutoberth"; repo = "SonyHeadphonesClient"; rev = "v${version}"; - hash = "sha256-0DQanrglJiGsN8qQ5KxkL8I+Fpt1abeeuKiM8v9GclM="; + hash = "sha256-vhI97KheKzr87exCh4xNN7NDefcagdMu1tWSt67vLiU="; fetchSubmodules = true; }; From 6199e72b49d9499a346c55a3b63120a846d402e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 20:10:37 +0000 Subject: [PATCH 054/182] ballerina: 2201.4.0 -> 2201.5.0 --- pkgs/development/compilers/ballerina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 20c13c9f25dd..80c272a08588 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.4.0"; + version = "2201.5.0"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - sha256 = "sha256-720QKGOerRzXsnbUghk+HGOMl4lQxHDYya3+FHtU/Ys="; + sha256 = "sha256-6UpUKoUHkYW9aPo2AbpP5uC1rCv578ultG9II1jZPRE="; }; nativeBuildInputs = [ makeWrapper ]; From c158c5bc151aa666e6938dae4bae8043239d2b0f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 19 Apr 2023 21:15:00 +0200 Subject: [PATCH 055/182] freenet: Reduce closure size Reduce the closure size from 1.0G to 174.7M. --- .../applications/networking/p2p/freenet/default.nix | 4 ++-- .../networking/p2p/freenet/freenetWrapper | 2 +- pkgs/top-level/all-packages.nix | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index c7a1a02fc241..8a46b5a476c1 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, gradle, bash, coreutils +{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils , substituteAll, nixosTests, perl, fetchpatch, writeText }: let @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { wrapper = substituteAll { src = ./freenetWrapper; - inherit bash coreutils jdk seednodes; + inherit bash coreutils jre seednodes; }; # https://github.com/freenet/fred/blob/next/build-offline.sh diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index f8292615de7a..74ff2c62961f 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -15,4 +15,4 @@ cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref chmod u+rw -- $FREENET_HOME/seednodes.fref cd -- $FREENET_HOME -exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" +exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac8b735a293..2daf308d0642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30495,6 +30495,19 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { gradle = gradle_7; + jdk = jdk_headless; + # Reduce closure size + jre = pkgs.jre_minimal.override { + modules = [ + "java.base" + "java.logging" + "java.naming" + "java.sql" + "java.desktop" + "java.management" + ]; + jdk = jdk_headless; + }; }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; From 828f60c5febd77adf6bbc5da81e6e701d9949e2f Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Wed, 26 Apr 2023 15:15:30 -0500 Subject: [PATCH 056/182] twm: 0.4.0 -> 0.6.0 --- pkgs/tools/misc/twm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 524f74f33182..5ad3deea1954 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CC3FlEX86mrRi+TFOoswHEaxKbvFm5fHSqbikgZdPA8="; + sha256 = "sha256-OUaT/JMh4JgFbzIYlU34EN7gxEydNKBXSLJfYKOeck4="; }; - cargoHash = "sha256-TCqXoFkxwqYuztaPdtfcSVL6psYkVaafOrUT6bUd8ig="; + cargoHash = "sha256-VGbY3QRkO4znEGs2daUhpDeNntONwvGeUg1ryFyWmjE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; From c8a41009da9e948faee31599388f158ef582f269 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Apr 2023 20:25:24 +0000 Subject: [PATCH 057/182] libvgm: unstable-2023-01-18 -> unstable-2023-04-22 --- pkgs/development/libraries/libvgm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 733a75e5fc90..e6f985225ef5 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2023-01-18"; + version = "unstable-2023-04-22"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "c250212538dd48d3965826ad7fe669bb0f348cbd"; - sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc="; + rev = "669a7566a356393d4e5b1030a9f9cdd3486bb41b"; + sha256 = "U/PO/YtS8bOb2yKk57UQKH4eRNysYC/hrmUR5YZyYlw="; }; outputs = [ From 44d9f4b5b2753dcdf183f0234e841dcc622c2032 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 22:50:48 +0200 Subject: [PATCH 058/182] python310Packages.schedule: add changelog to meta --- pkgs/development/python-modules/schedule/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index da9825434bad..0721a360cb7b 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python job scheduling for humans"; homepage = "https://github.com/dbader/schedule"; + changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst"; license = licenses.mit; }; - } From 253aa28f82ccdcb1a944320fc22a39d92f703424 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 22:53:38 +0200 Subject: [PATCH 059/182] python310Packages.schedule: disable on unsupported Python releases - add format --- pkgs/development/python-modules/schedule/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 0721a360cb7b..cdc6cd754b4e 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -2,18 +2,24 @@ , buildPythonPackage , fetchPypi , mock +, pythonOlder }: buildPythonPackage rec { pname = "schedule"; version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0="; + hash = "sha256-tK1peq+6cYTJ62oeLrxB94FUckKs3ozq6aCiWwTAki0="; }; - buildInputs = [ mock ]; + buildInputs = [ + mock + ]; preCheck = '' # https://github.com/dbader/schedule/issues/488 @@ -27,5 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/dbader/schedule"; changelog = "https://github.com/dbader/schedule/blob/${version}/HISTORY.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From c0b74e7fd8c405b395c569c2ffac3765281badd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 22:56:00 +0200 Subject: [PATCH 060/182] python310Packages.schedule: add pythonImportsCheck --- pkgs/development/python-modules/schedule/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index cdc6cd754b4e..bdcb2010742a 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { "# self.assertRaises(ScheduleValueError, every().day.until, datetime.time(hour=5))" ''; + pythonImportsCheck = [ + "schedule" + ]; + meta = with lib; { description = "Python job scheduling for humans"; homepage = "https://github.com/dbader/schedule"; From 278090b33841427370e7e46e700321eb1c7f36ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 22:57:57 +0200 Subject: [PATCH 061/182] python310Packages.aliyun-python-sdk-config: 2.2.7 -> 2.2.8 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index ebfe967f1df5..2fb0ab8331b3 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.7"; + version = "2.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IJMU16RySVo6nw5PwreZBLETzF8mH5PdZyE+YgoUVYo="; + hash = "sha256-0rGI2YMT78gstfHmQD63hdvICQ3WlKgkx8unsDegaXw="; }; propagatedBuildInputs = [ From d0ea6c4ecdb5ccd50662023e9355df5869b78218 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Apr 2023 23:02:00 +0200 Subject: [PATCH 062/182] python310Packages.python-gvm: 23.4.1 -> 23.4.2 Diff: https://github.com/greenbone/python-gvm/compare/refs/tags/v23.4.1...v23.4.2 Changelog: https://github.com/greenbone/python-gvm/releases/tag/v23.4.2 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 3ea1d0d89a8c..2311240a7896 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.4.1"; + version = "23.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RuyOhFerWSJ/JEQTruv1gh/ieO2X99E33VW28assflY="; + hash = "sha256-ONCPC05NYyymTKiJZaDTdcShLLy4+K+JwROVVXBkz+o="; }; nativeBuildInputs = [ From 99cb935fbf21590ddc4660639a308a96ee832f23 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 27 Apr 2023 00:42:21 +0300 Subject: [PATCH 063/182] telegram-desktop: remove crimes This may have worked 4 years ago, but it most definitely does not work on the binary wrapper. --- .../instant-messengers/telegram/telegram-desktop/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 33c943e3bc97..254540bf8f93 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -181,10 +181,7 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" - sed -i $out/bin/telegram-desktop \ - -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; passthru = { From 4d3b2132a5bcf3ee4654e1aeb530022fbbcbc9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Apr 2023 23:58:17 +0200 Subject: [PATCH 064/182] mdcat: 2.0.2 -> 2.0.3 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 0fdfae133024..2675bd176751 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - sha256 = "sha256-JevndaSGeIzLV/h4ljUwx6vL60aKWYzmKWOgQDPMAaA="; + sha256 = "sha256-S47xJmwOCDrJJSYP9WiUKFWR9UZDNgY3mc/fTHaKsvA="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-SCgffumT6g8YIHmjUfgc43ATMAQPd2wJBsN9Ax5cqHk="; + cargoSha256 = "sha256-g/Il3Sff9NtEfGTXBOGyRw6/GXje9kVwco0URyhv4TI="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From 01bc75d0bfa526176c8669202cf99977b992b48c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 00:29:45 +0200 Subject: [PATCH 065/182] python310Packages.pydeps: 1.12.1 -> 1.12.2 Diff: https://github.com/thebjorn/pydeps/compare/refs/tags/v1.12.1...v1.12.2 Changelog: https://github.com/thebjorn/pydeps/releases/tag/v1.12.2 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 579f7600e868..d47c77e533f7 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.1"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lwQaU7MwFuk+VBCKl4zBNWRFo88/uW2DxXjiZNyuHAg="; + hash = "sha256-c5A9iUq2M2PL76pi5v4AMqOsYLYYKN7ugYd8w7VfrYk="; }; buildInputs = [ From baabb309a88fd7c1e7457bb7bfb145e9bce2b190 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 00:34:15 +0200 Subject: [PATCH 066/182] trufflehog: 3.32.2 -> 3.33.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.32.2...v3.33.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.33.0 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index dc955510de00..b7614d74145c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.32.2"; + version = "3.33.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-+iGk3pmmpiljnmX0yCL3/X+icWvukxVA5n32npVBGOM="; + hash = "sha256-ZbsWPyLPN6qTMyEuisLA589B5JgYV9LixuRV91G/6oY="; }; vendorHash = "sha256-sSpRu6zLIvllrDYdtrj3oD3pCVs9ucSXbu3IYTqjT+k="; From 5f96aa94364effe057e59dbf4a11050c3403b8e9 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Tue, 25 Apr 2023 22:14:03 +0200 Subject: [PATCH 067/182] texlive.combine: wrap with FONTCONFIG_FILE This is neccessary for XeTeX to find the fonts distributed with TeXLive. The fontconfig file generated by makeFontsConf is almost identical to the one from the fontconfig package and /etc/fonts/fonts.conf on NixOS -- it only adds the specified font directories. In particular this means that all the actual configuration files in /etc/fonts/conf.d are still included and there also is a /usr/share/fonts font directory entry for use with non-NixOS linuxes, so it's unlikely that this breaks someone's setup. --- pkgs/tools/typesetting/tex/texlive/combine.nix | 8 +++++--- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 80070cc6cfaa..22f644d9cb09 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -196,7 +196,11 @@ in (buildEnv { makeWrapper "$target" "$link" \ --prefix PATH : "${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:$out/bin:${perl}/bin" \ --prefix PERL5LIB : "$PERL5LIB" \ - --set-default TEXMFCNF "$TEXMFCNF" + --set-default TEXMFCNF "$TEXMFCNF" \ + --set-default FONTCONFIG_FILE "${ + # neccessary for XeTeX to find the fonts distributed with texlive + makeFontsConf { fontDirectories = [ "${texmfroot}/texmf-dist/fonts" ]; } + }" # avoid using non-nix shebang in $target by calling interpreter if [[ "$(head -c 2 "$target")" = "#!" ]]; then @@ -311,5 +315,3 @@ in (buildEnv { '' ; }).overrideAttrs (_: { allowSubstitutes = true; }) -# TODO: make TeX fonts visible by fontconfig: it should be enough to install an appropriate file -# similarly, deal with xe(la)tex font visibility? diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index cbdedc9310c3..e46f6425b497 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,7 +5,7 @@ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz , makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils -, libfaketime +, libfaketime, makeFontsConf , useFixedHashes ? true , recurseIntoAttrs }: @@ -24,7 +24,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv lib makeWrapper writeText - stdenv python3 ruby perl gnused gnugrep coreutils libfaketime; + stdenv python3 ruby perl gnused gnugrep coreutils libfaketime makeFontsConf; ghostscript = ghostscript_headless; }; From c5403f4505d77de2510cae3b7fc4b6cffed6c309 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Tue, 25 Apr 2023 22:21:42 +0200 Subject: [PATCH 068/182] texlive.combine: expose font directory via passthru This is for example useful for ncluding the texlive font directory in the `fonts.fonts` NixOS option. --- pkgs/tools/typesetting/tex/texlive/combine.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 22f644d9cb09..8bf807a140b6 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -82,8 +82,12 @@ in (buildEnv { nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ]; buildInputs = pkgList.extraInputs; - # This is set primarily to help find-tarballs.nix to do its job - passthru.packages = pkgList.all; + passthru = { + # This is set primarily to help find-tarballs.nix to do its job + packages = pkgList.all; + # useful for inclusion in the `fonts.fonts` nixos option or for use in devshells + fonts = "${texmfroot}/texmf-dist/fonts"; + }; postBuild = '' TEXMFROOT="${texmfroot}" From f2644470f9fb29bff1f677fe469e68468100f807 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Thu, 27 Apr 2023 00:34:53 +0200 Subject: [PATCH 069/182] tests.texlive: also test xelatex in the opentype font test --- pkgs/test/texlive/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index cbfa0c45e8fc..91a894906cc7 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -11,11 +11,11 @@ diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch" ''; - luaotfload-fonts = runCommand "texlive-test-lualatex" { + opentype-fonts = runCommand "texlive-test-opentype" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-medium libertinus-fonts; }) ]; - input = builtins.toFile "lualatex-testfile.tex" '' + input = builtins.toFile "opentype-testfile.tex" '' \documentclass{article} \usepackage{fontspec} \setmainfont{Libertinus Serif} @@ -26,7 +26,13 @@ } '' export HOME="$(mktemp -d)" + # We use the same testfile to test two completely different + # font discovery mechanisms, both of which were once broken: + # - lualatex uses its own luaotfload script (#220228) + # - xelatex uses fontconfig (#228196) + # both of the following two commands need to succeed. lualatex -halt-on-error "$input" + xelatex -halt-on-error "$input" echo success > $out ''; From 27f62b7ca87f72b6b8a2d0d2e9db20099760875e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 00:37:29 +0200 Subject: [PATCH 070/182] exploitdb: 2023-04-25 -> 2023-04-26 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 11983f28d689..2229be751641 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-04-25"; + version = "2023-04-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TadZ7lDknEKmp8GQIIVCpGq7YkU0MPjXTFSc+D7cZJo="; + hash = "sha256-FewjLaCJbZKEZd+bCtpeyRahR3Yc/mn8pixYHHaUQrQ="; }; nativeBuildInputs = [ From 65bc0111587a188992befd954b7f855ec9d893c4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 27 Apr 2023 08:47:19 +1000 Subject: [PATCH 071/182] terraform: 1.4.5 -> 1.4.6 Diff: https://github.com/hashicorp/terraform/compare/v1.4.5...v1.4.6 Changelog: https://github.com/hashicorp/terraform/blob/v1.4.6/CHANGELOG.md --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a3d906cdf445..636570150e99 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,9 +166,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.4.5"; - hash = "sha256-mnJ9d3UHAZxmz0i7PH0JF5gA3m3nJxM2NyAn0J0L6u8="; - vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE="; + version = "1.4.6"; + hash = "sha256-V5sI8xmGASBZrPFtsnnfMEHapjz4BH3hvl0+DGjUSxQ="; + vendorHash = "sha256-OW/aS6aBoHABxfdjDxMJEdHwLuHHtPR2YVW4l0sHPjE="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From 24cea5a7f9224d76b82bdba51b9be851d2442828 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 01:03:20 +0200 Subject: [PATCH 072/182] python310Packages.syrupy: 4.0.1 -> 4.0.2 Diff: https://github.com/tophat/syrupy/compare/refs/tags/v4.0.1...v4.0.2 Changelog: https://github.com/tophat/syrupy/releases/tag/v4.0.2 --- pkgs/development/python-modules/syrupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 8b22b098a8ce..4043cb637c2f 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.0.1"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-BL1Z1hPMwU1duAZb3ZTWWKS/XGv8RJ6/4YoBhktd5NE="; + hash = "sha256-luYYh6L7UxW8wkp1zxR0EOmyTj0mIZ6Miy6HcVHebo4="; }; nativeBuildInputs = [ From b49a7333f613f56d841ff168ae4c7bd4dac3d434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Wed, 26 Apr 2023 20:53:55 -0300 Subject: [PATCH 073/182] budgie.budgie-desktop: 10.7.1 -> 10.7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 252f4cbd38d4..439a9fe23f27 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "budgie-desktop"; - version = "10.7.1"; + version = "10.7.2"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0="; + hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps="; }; nativeBuildInputs = [ @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { gnome.gnome-bluetooth_1_0 gnome.gnome-settings-daemon gnome.mutter + gnome.zenity graphene gtk3 ibus From e96baa117a556e970078b156274a5a1a48b97d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Wed, 26 Apr 2023 20:54:18 -0300 Subject: [PATCH 074/182] nixos/budgie: Add Zenity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- nixos/modules/services/x11/desktop-managers/budgie.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 6e6d5ef3face..a06a6d6d683e 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -86,6 +86,9 @@ in { # Required by Budgie Menu. gnome-menus + # Required by Budgie Control Center. + gnome.zenity + # Provides `gsettings`. glib From 46a84aa1b700e18cea536ff165eaecf26103cbae Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 25 Apr 2023 12:53:30 +0800 Subject: [PATCH 075/182] cinnamon.warpinator: 1.4.5 -> 1.6.1 https://github.com/linuxmint/warpinator/compare/1.4.5...1.6.1 --- pkgs/desktops/cinnamon/warpinator/default.nix | 59 +++++++++++-------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index a488baab0071..fbf5df1fc7ce 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub +{ stdenv +, fetchFromGitHub , lib , gobject-introspection , meson @@ -6,24 +7,39 @@ , python3 , gtk3 , gdk-pixbuf +, xapp , wrapGAppsHook , gettext , polkit , glib , gitUpdater +, bubblewrap }: -python3.pkgs.buildPythonApplication rec { +let + pythonEnv = python3.withPackages (pp: with pp; [ + grpcio-tools + protobuf + pygobject3 + setproctitle + pp.xapp + zeroconf + grpcio + setuptools + cryptography + pynacl + netifaces + ]); +in +stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.4.5"; - - format = "other"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-5mMV4WinpFR9ihgoQsgIXre0VpBdg9S8GjSkx+7ocLg="; + hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k="; }; nativeBuildInputs = [ @@ -39,20 +55,8 @@ python3.pkgs.buildPythonApplication rec { glib gtk3 gdk-pixbuf - ]; - - propagatedBuildInputs = with python3.pkgs; [ - grpcio-tools - protobuf - pygobject3 - setproctitle + pythonEnv xapp - zeroconf - grpcio - setuptools - cryptography - pynacl - netifaces ]; mesonFlags = [ @@ -66,15 +70,18 @@ python3.pkgs.buildPythonApplication rec { find . -type f -exec sed -i \ -e s,/usr/libexec/warpinator,$out/libexec/warpinator,g \ {} + - ''; - dontWrapGApps = true; # Prevent double wrapping + # We make bubblewrap mode always available since + # landlock mode is not supported in old kernels. + substituteInPlace src/warpinator-launch.py \ + --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ + --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ + --replace 'GLib.find_program_in_path("bwrap")' "True" - preFixup = '' - # these get loaded via import from bin, so don't need wrapping - chmod -x+X $out/libexec/warpinator/*.py - - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + # Typo fix that can be removed on next update + # https://github.com/linuxmint/warpinator/pull/174 + substituteInPlace src/remote.py \ + --replace "receiver.remaining_count" "op.remaining_count" ''; passthru.updateScript = gitUpdater { From 02633ab77c9113a232983f168c8e22b727500f63 Mon Sep 17 00:00:00 2001 From: geri1701 Date: Thu, 27 Apr 2023 00:50:26 +0200 Subject: [PATCH 076/182] typst-fmt: unstable-2023-04-16 -> unstable-2023-04-26 Delete postPatch --- pkgs/tools/typesetting/typst-fmt/Cargo.lock | 164 ++++++++++++++++--- pkgs/tools/typesetting/typst-fmt/default.nix | 12 +- 2 files changed, 144 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/typesetting/typst-fmt/Cargo.lock b/pkgs/tools/typesetting/typst-fmt/Cargo.lock index 2329bac7091c..c6117661bba5 100644 --- a/pkgs/tools/typesetting/typst-fmt/Cargo.lock +++ b/pkgs/tools/typesetting/typst-fmt/Cargo.lock @@ -17,6 +17,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + [[package]] name = "anstream" version = "0.3.0" @@ -149,9 +158,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.2.2" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" dependencies = [ "clap_builder", "clap_derive", @@ -160,9 +169,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.2" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" dependencies = [ "anstream", "anstyle", @@ -203,9 +212,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comemo" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b396e6f0a1a7d2c1d588fd8a255a8c30a8edeef65bc96b4afb3fdb8a8bf281" +checksum = "1ba423e212681b51c5452a458bb24e88165f4c09857a783c802719cc46313f3f" dependencies = [ "comemo-macros", "siphasher", @@ -213,9 +222,9 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421c3e125e48959f3b6a18c0d266f3c228f6e28464c73cc44cff24e808fcda2d" +checksum = "fca5ceeb99665bad04a32fe297d1581a68685e36fb6da92a1c9b7d9693638c01" dependencies = [ "proc-macro2", "quote", @@ -254,9 +263,9 @@ dependencies = [ [[package]] name = "ecow" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60e2840fbfc397c7972b11a6e6bd99a0248921cc1e31f293c5f6c5ac24831da" +checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" [[package]] name = "either" @@ -335,6 +344,17 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fontdb" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52186a39c335aa6f79fc0bf1c3cf854870b6ad4e50a7bb8a59b4ba1331f478a" +dependencies = [ + "log", + "memmap2", + "ttf-parser 0.17.1", +] + [[package]] name = "gif" version = "0.11.4" @@ -372,7 +392,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr 1.4.0", "fnv", "log", @@ -502,15 +522,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" [[package]] name = "log" @@ -533,6 +553,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + [[package]] name = "miniz_oxide" version = "0.5.4" @@ -614,6 +643,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + [[package]] name = "pixglyph" version = "0.1.0" @@ -645,6 +680,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "quote" version = "1.0.26" @@ -662,11 +706,11 @@ checksum = "9ae028b272a6e99d9f8260ceefa3caa09300a8d6c8d2b2001316474bc52122e9" [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", "regex-syntax", ] @@ -679,9 +723,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "resvg" @@ -720,9 +764,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" dependencies = [ "bitflags", "errno", @@ -848,6 +892,19 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "strsim" version = "0.10.0" @@ -966,12 +1023,50 @@ dependencies = [ "winnow", ] +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + [[package]] name = "ttf-parser" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" +[[package]] +name = "ttf-parser" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff" + [[package]] name = "ttf-parser" version = "0.18.1" @@ -981,13 +1076,14 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "typst" version = "0.2.0" -source = "git+https://github.com/typst/typst.git#1e948f7fa29395cfc2bd704bfdbe6019229ba500" +source = "git+https://github.com/typst/typst.git#ff1e4049d168c7526d3e5e65a8a42bef9500bbf7" dependencies = [ "bitflags", "bytemuck", "comemo", "ecow", "flate2", + "fontdb", "if_chain", "image", "indexmap", @@ -1002,10 +1098,12 @@ dependencies = [ "rustybuzz", "serde", "siphasher", + "stacker", "subsetter", "svg2pdf", "thin-vec", "tiny-skia", + "tracing", "ttf-parser 0.18.1", "typst-macros", "unicode-math-class", @@ -1034,7 +1132,7 @@ dependencies = [ [[package]] name = "typst-macros" version = "0.2.0" -source = "git+https://github.com/typst/typst.git#1e948f7fa29395cfc2bd704bfdbe6019229ba500" +source = "git+https://github.com/typst/typst.git#ff1e4049d168c7526d3e5e65a8a42bef9500bbf7" dependencies = [ "heck", "proc-macro2", @@ -1043,6 +1141,12 @@ dependencies = [ "unscanny", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-bidi-mirroring" version = "0.1.0" @@ -1085,6 +1189,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -1107,14 +1217,20 @@ dependencies = [ "data-url", "flate2", "float-cmp", + "fontdb", "kurbo", "log", "pico-args", "rctree", "roxmltree", + "rustybuzz", "simplecss", "siphasher", "svgtypes", + "ttf-parser 0.15.2", + "unicode-bidi", + "unicode-script", + "unicode-vo", ] [[package]] diff --git a/pkgs/tools/typesetting/typst-fmt/default.nix b/pkgs/tools/typesetting/typst-fmt/default.nix index 45e4f66d56b9..24bca427b6c9 100644 --- a/pkgs/tools/typesetting/typst-fmt/default.nix +++ b/pkgs/tools/typesetting/typst-fmt/default.nix @@ -1,26 +1,22 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "typst-fmt"; - version = "unstable-2023-04-16"; + version = "unstable-2023-04-26"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = pname; - rev = "9ed1fd1656f8e776b6c8d9d326c488f5ba1091eb"; - hash = "sha256-yHR13n5yx5Yl2atteGQq+qqz21zsy37ZJfGllbvSZcQ="; + rev = "cb299645244551bfc91dc4579a2543a0d4cc84b0"; + hash = "sha256-/+m3HkOsBiOAhOqBfv+hPauvDKqfCrwOWGDtYfW5zJQ="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "typst-0.2.0" = "sha256-+YHyxZTzMG9zpzLV9NgJsMtrXG+/ymPQo5b26HDYJaQ="; + "typst-0.2.0" = "sha256-6Uezm3E/qGl9303auqjvfWe3KKsqwsHeXUrjWemjJKU="; }; }; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; - checkFlags = [ # test_eof is ignored upstream "--skip=rules::tests_typst_format::test_eof" From cb84557817e7a90f1c87758899f54493d908be7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 01:00:15 +0000 Subject: [PATCH 077/182] vmagent: 1.85.3 -> 1.90.0 --- pkgs/servers/monitoring/vmagent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index c19be7871707..bd7df1ee30db 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.85.3"; + version = "1.90.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-/p5oHxp1fVyUMjZ3vim9YKNhFqIACGa3KTYIv/k4MXg="; + sha256 = "sha256-XENouirZ8d92h+4KNI3K7k7e2kF3sah5DAZjlC2pVds="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; - vendorSha256 = null; + vendorHash = null; subPackages = [ "app/vmagent" ]; From 737243dd1fb85fcc9bdb29e9f7eeb52557d372fd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 26 Apr 2023 10:27:16 +0800 Subject: [PATCH 078/182] pantheon.elementary-gtk-theme: 7.1.0 -> 7.2.0 https://github.com/elementary/stylesheet/releases/tag/7.2.0 --- .../artwork/elementary-gtk-theme/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 75995109629d..c297ec27a3a9 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, fetchpatch , nix-update-script , gettext , meson @@ -11,15 +12,24 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-AFiREZ4pDIwQ4OeZDIHEJUNSeUsMjAlDd5h0pB0ilNw="; + sha256 = "sha256-ZR0FJ8DkPlO1Zatvxv3NghAVBPo2j+1m0k4C+gvYPVA="; }; + patches = [ + # Headerbars: fix missing default-decoration + # https://github.com/elementary/stylesheet/pull/1258 + (fetchpatch { + url = "https://github.com/elementary/stylesheet/commit/9cea2383bec8f90d25f1e9b854b5221737487521.patch"; + sha256 = "sha256-6komROS4+nxwoGoKoiDmnrTfLNZAvnTU6hIEOQQfmxc="; + }) + ]; + nativeBuildInputs = [ gettext meson From c4468abc42211e8f2f8ed7a775fcf31ba48d1b1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 01:09:39 +0000 Subject: [PATCH 079/182] plantuml-server: 1.2023.1 -> 1.2023.6 --- pkgs/tools/misc/plantuml-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 607bc53033d5..eba31269ba5f 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.1"; + version = "1.2023.6"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-SaUk+gaMCpKF1HR9tpEhbZNmKV70LPHeH/YPsU8WGsU="; + sha256 = "sha256-ECzmT6VMjuoJT91iEYOS2ov0bsmNuwIKTwBgsLqwgDI="; }; dontUnpack = true; From 5ebba258151904feecf318511922143a6d8f8658 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 27 Apr 2023 09:10:54 +0800 Subject: [PATCH 080/182] minder: 1.15.0 -> 1.15.1 https://github.com/phase1geo/Minder/compare/1.15.0...1.15.1 --- pkgs/applications/misc/minder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 0a65ecb64b2d..3d5c49c94c68 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "sha256-5k6a7/49iqtPt7il1/LlCHlQsilXRcGAJSAkJ3BBowU="; + sha256 = "sha256-JKbz7UUl5iQxquBH705WBN9T4q7OondTypnEUGfqBWY="; }; nativeBuildInputs = [ From e90e0a05f43adc5a5fbdfa4bd5255617fde6c2bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 01:28:02 +0000 Subject: [PATCH 081/182] automatic-timezoned: 1.0.82 -> 1.0.85 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index cc8c978fbcd3..36eb6775616a 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.82"; + version = "1.0.85"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ONpOGu2xzCJMQiuqeRfjPiOvuXfnaaah7OvAtHa7F4s="; + sha256 = "sha256-YHcPAYJVodD9b8FFMhqAI6AOuuB4IHCuc+hCV6foUy8="; }; - cargoHash = "sha256-lzhrze7VbI0jCJTLCjc+rZu4xlEYnZ76V9pSeigaCn8="; + cargoHash = "sha256-NcQgpzuUwhsv0HvV/T1XOy8H3ktGMfxml/bKs/2ChgQ="; meta = with lib; { description = "Automatically update system timezone based on location"; From 22ed6259dc6ca2b462498a8f7294a4b2e8c11cbe Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 26 Apr 2023 17:42:52 -0400 Subject: [PATCH 082/182] rtabmap: unstable-2022-09-24 -> 0.21.0; unbreak --- .../rtabmap/0001-remove-printer-support.patch | 139 ------------------ pkgs/applications/video/rtabmap/default.nix | 50 ++++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 30 insertions(+), 161 deletions(-) delete mode 100644 pkgs/applications/video/rtabmap/0001-remove-printer-support.patch diff --git a/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch b/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch deleted file mode 100644 index f3b31ed95861..000000000000 --- a/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch +++ /dev/null @@ -1,139 +0,0 @@ -From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001 -From: ckie -Date: Tue, 8 Feb 2022 19:18:49 +0200 -Subject: [PATCH] remove printer support - ---- - app/src/CMakeLists.txt | 4 ++-- - guilib/src/CMakeLists.txt | 4 ++-- - guilib/src/GraphViewer.cpp | 12 +----------- - guilib/src/ImageView.cpp | 16 ---------------- - guilib/src/utilite/UPlot.cpp | 9 --------- - 5 files changed, 5 insertions(+), 40 deletions(-) - -diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt -index b20a07d4..2cad8c1e 100644 ---- a/app/src/CMakeLists.txt -+++ b/app/src/CMakeLists.txt -@@ -63,9 +63,9 @@ ENDIF() - TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES}) - IF(Qt5_FOUND) - IF(Qt5Svg_FOUND) -- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport) -+ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg) - ELSE() -- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport) -+ QT5_USE_MODULES(rtabmap Widgets Core Gui) - ENDIF() - ENDIF(Qt5_FOUND) - -diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt -index 3711205b..a393aa25 100644 ---- a/guilib/src/CMakeLists.txt -+++ b/guilib/src/CMakeLists.txt -@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES}) - TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES}) - IF(Qt5_FOUND) - IF(Qt5Svg_FOUND) -- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport) -+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg) - ELSE() -- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport) -+ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui) - ENDIF() - ENDIF(Qt5_FOUND) - -diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp -index 58907c34..7b41061f 100644 ---- a/guilib/src/GraphViewer.cpp -+++ b/guilib/src/GraphViewer.cpp -@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include - #include - #ifdef QT_SVG_LIB - #include -@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event) - this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents - QSize sceneSize = this->scene()->sceneRect().size().toSize(); - -- if(QFileInfo(filePath).suffix().compare("pdf") == 0) -- { -- QPrinter printer(QPrinter::HighResolution); -- printer.setOrientation(QPrinter::Portrait); -- printer.setOutputFileName( filePath ); -- QPainter p(&printer); -- scene()->render(&p); -- p.end(); -- } -- else if(QFileInfo(filePath).suffix().compare("svg") == 0) -+ if(QFileInfo(filePath).suffix().compare("svg") == 0) - { - #ifdef QT_SVG_LIB - QSvgGenerator svgGen; -diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp -index 714f2d36..887e7bdc 100644 ---- a/guilib/src/ImageView.cpp -+++ b/guilib/src/ImageView.cpp -@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include - #include - #include "rtabmap/utilite/ULogger.h" - #include "rtabmap/gui/KeypointItem.h" -@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e) - } - - _savedFileName = text; -- if(QFileInfo(text).suffix().compare("pdf") == 0) -- { -- QPrinter printer(QPrinter::HighResolution); -- printer.setOrientation(QPrinter::Portrait); -- printer.setOutputFileName( text ); -- QPainter p(&printer); -- p.begin(&printer); -- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width()); -- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height()); -- double scale = qMin(xscale, yscale); -- p.scale(scale, scale); -- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect()); -- p.end(); -- } -- else - { - QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied); - QPainter p(&img); -diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp -index 1b11c65e..8bf94841 100644 ---- a/guilib/src/utilite/UPlot.cpp -+++ b/guilib/src/utilite/UPlot.cpp -@@ -42,7 +42,6 @@ - #include - #include - #include --#include - #include - #include - #ifdef QT_SVG_LIB -@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event) - else - { - #endif -- if(QFileInfo(text).suffix().compare("pdf") == 0) -- { -- QPrinter printer; -- printer.setOutputFormat(QPrinter::PdfFormat); -- printer.setOutputFileName(text); -- this->render(&printer); -- } -- else - { - QPixmap figure = QPixmap::grabWidget(this); - figure.save(text); --- -2.34.1 - diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index cecf6a3e4d3d..ecfd8a676bca 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -1,24 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen -, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect -, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack -, xorg }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, opencv +, pcl +, libusb1 +, eigen +, wrapQtAppsHook +, qtbase +, g2o +, ceres-solver +, libpointmatcher +, octomap +, freenect +, libdc1394 +, librealsense +, libGL +, libGLU +, vtkWithQt5 +, wrapGAppsHook +, liblapack +, xorg +}: stdenv.mkDerivation rec { pname = "rtabmap"; - version = "unstable-2022-09-24"; + version = "0.21.0"; src = fetchFromGitHub { owner = "introlab"; repo = "rtabmap"; - rev = "fa31affea0f0bd54edf1097b8289209c7ac0548e"; - sha256 = "sha256-kcY+o31fSmwxBcvF/e+Wu6OIqiQzLKgEJJxcj+g3qDM="; + rev = "refs/tags/${version}"; + hash = "sha256-1xb8O3VrErldid2OgAUMG28mSUO7QBUsPuSz8p03tSI"; }; - patches = [ - # Our Qt5 seems to be missing PrintSupport.. I think? - ./0001-remove-printer-support.patch - ]; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ ## Required @@ -41,25 +57,17 @@ stdenv.mkDerivation rec { qtbase libGL libGLU - vtk_8_withQt5 + vtkWithQt5 ]; # Disable warnings that are irrelevant to us as packagers cmakeFlags = [ "-Wno-dev" ]; - # We run one of the executables we build while the build is - # still running (and patchelf hasn't been invoked) which means - # the RPATH is not set correctly. This hacks around that error: - # - # build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory - LD_LIBRARY_PATH = "/build/source/build/bin"; - meta = with lib; { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; license = licenses.bsd3; maintainers = with maintainers; [ ckie ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac8b735a293..ec3e69a96dca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11484,7 +11484,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { - pcl = pcl.override { vtk = vtk_8_withQt5; }; + pcl = pcl.override { vtk = vtkWithQt5; }; }; rtaudio = callPackage ../development/libraries/audio/rtaudio { From 13c290c37368018e85feaaac30608c03c7e633ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 03:12:24 +0000 Subject: [PATCH 083/182] babashka: 1.3.178 -> 1.3.179 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 692b5330ca3a..20c9b497bb7e 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.3.178"; + version = "1.3.179"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-ihARaZ8GJsoFmlOd0qtbOAQkbs6a9zohJ9PREJoxdZg="; + sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U="; }; graalvmDrv = graalvmCEPackages.graalvm19-ce; From 8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 26 Apr 2023 20:26:58 -0700 Subject: [PATCH 084/182] openafs: Patch for Linux kernel 6.3 (#228217) Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index cd1f71b77ec8..4485f86c7f76 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -73,6 +73,16 @@ stdenv.mkDerivation { url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f"; hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8="; }) + # Linux 6.3: Include linux/filelock.h if available + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15388/revisions/ddb99d32012c43c76ae37f6a7563f1ca32f0e964/patch"; + hash = "sha256-0Cql4+0ISfW4J4D7PhlSYNfIKAeDVWEz57PHOu5TRXg="; + }) + # Linux 6.3: Use mnt_idmap for inode op functions + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/15389/revisions/ff0d53d2fb38fc3b262f02fb1c5f49b286ff13dd/patch"; + hash = "sha256-KyVAI/A+/lNrLyKY6O8DgMKzgnF6P5sOfSq3qcs6Qq0="; + }) ]; hardeningDisable = [ "pic" ]; From df1b665111089c3d5ca0f2b190a967140aa5a5df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 03:38:37 +0000 Subject: [PATCH 085/182] lscolors: 0.13.0 -> 0.14.0 --- pkgs/applications/misc/lscolors/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index b80c8d0a2abf..41e687c23e40 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.13.0"; + version = "0.14.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I="; + sha256 = "sha256-YVKs/1R//oKYBSSGnj6UMFo5zDp5O3QDDdkDKF4ICBk="; }; - cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q="; + cargoHash = "sha256-EJdjSFgvvwH5beW+aD1KT5G9bpW/8mdi+7c27KSkZjo="; # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; From c6113676c21a2bbf3fede99d6afa2c3340b06feb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 03:52:43 +0000 Subject: [PATCH 086/182] p4c: 1.2.3.7 -> 1.2.3.8 --- pkgs/development/compilers/p4c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index c26aa44170f1..e4d896f96be8 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.7"; + version = "1.2.3.8"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-s9uUq86xbqU21jfAF42blbbIvHlkv7W75rotjSbMxHc="; + sha256 = "sha256-EvMoooB6kAV0fJ3XBFJKpams87ImybTXw0C5P9YAa9Q="; fetchSubmodules = true; }; From 002add16d703513456b6153e6340c06246460936 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 03:53:02 +0000 Subject: [PATCH 087/182] ecs-agent: 1.70.1 -> 1.70.2 --- pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 928eb53c2715..494d33ec8716 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.70.1"; + version = "1.70.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-CAoMXWxtsGJOEOxZ8ZLwLYAWW0kY/4jryrIAFDbOeXA="; + hash = "sha256-52Ty7g8SnhYAgYsE9mpmRmg4T6QifjWDIwNnJZBSPMk="; }; vendorHash = null; From 44b84c3d5b73399db429da91da83e86cff3dbba2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 04:08:51 +0000 Subject: [PATCH 088/182] patchelfUnstable: unstable-2023-04-23 -> unstable-2023-04-25 --- pkgs/development/tools/misc/patchelf/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index c4d9807e0b39..7d340cf547b0 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2023-04-23"; + version = "unstable-2023-04-25"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "99c24238981b7b1084313aca8f5c493bb46f302c"; - sha256 = "sha256-v8hMcFVtTknn1LMfRCDQa/bYgP/bpsPhSYp01TiCtew="; + rev = "008a582741617e2d7d5aa4aab1e8ddfdec0067d9"; + sha256 = "sha256-SC9zZbHN1p5BD6YHr+/ZNelmmZDozEO/vDwuCdJJCcs="; }; # Drop test that fails on musl (?) From 4b57a4cfdbacb0046dfe7e94b548a7b555d49e91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:07:02 +0000 Subject: [PATCH 089/182] terraform-providers.bigip: 1.17.0 -> 1.17.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d59f46fcce8c..d9e9c1a70266 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -155,11 +155,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=", + "hash": "sha256-SGwCEcPNxWw7Bsa4SQ1uWJ1rH/PZlkAMwvDy/fnXU3w=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.17.0", + "rev": "v1.17.1", "spdx": "MPL-2.0", "vendorHash": null }, From b59028ce8b739aec2b557cff09a0eb31c199bf32 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:08:45 +0000 Subject: [PATCH 090/182] terraform-providers.datadog: 3.23.0 -> 3.24.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d9e9c1a70266..de7e95f29e25 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -282,13 +282,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-rbBLyCxGB1W7VCPs1f/7PQnyvdWo+uhze6p4cucdEG0=", + "hash": "sha256-3C+jh9rGw2v2ME3PHLc+TIAY4UWcZVFdmNy4N4WyRM8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.23.0", + "rev": "v3.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hy4GQKhY+6bYdVAZensLU0EswZXfxZWY2YNyiTA2UaE=" + "vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", From f5575d3ddef4f29434d367b2c3e781e41a4c2e0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:14:00 +0000 Subject: [PATCH 091/182] terraform-providers.google: 4.63.0 -> 4.63.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index de7e95f29e25..f832caf16aeb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -437,12 +437,12 @@ "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ=" }, "google": { - "hash": "sha256-92abTfGWNFQMf8YjOxgKEncdqEdbfAt+3BU0fQaSnGk=", + "hash": "sha256-8uRIvFZsuPyisJMRmqL5zNxea6h1VwxZS+lmmvZslfo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.63.0", + "rev": "v4.63.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, From ea9a0219106c3fe9334b5f55a2bc2d40cea85562 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:14:52 +0000 Subject: [PATCH 092/182] terraform-providers.google-beta: 4.63.0 -> 4.63.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f832caf16aeb..88ee92f3b4dd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -447,12 +447,12 @@ "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, "google-beta": { - "hash": "sha256-OyaMoySQ7qd8fsxMcetZCUVvxi6nWwVJusNV61DASck=", + "hash": "sha256-avE1EnjCItz1NcF0KzsSgUnQABr2D0IC7kLGgIj+j6g=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.63.0", + "rev": "v4.63.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, From 15d6bbd6103a8ebab659cb77d9d972039dd3f5c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:17:30 +0000 Subject: [PATCH 093/182] terraform-providers.opennebula: 1.2.0 -> 1.2.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 88ee92f3b4dd..8422a9eb7a6f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -837,11 +837,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-Y1rNhXnHgwpKPgN5iZxH0ChHUBOj36K3XnSOkObj10g=", + "hash": "sha256-r5evkpYnT2foc9ucHVkalm0qVO8UCoLhoc9ro/TerRI=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.2.0", + "rev": "v1.2.1", "spdx": "MPL-2.0", "vendorHash": "sha256-W7UGOtyFsIMXPqFDnde2XlzU7klR7Fs00mSuJ9ID20A=" }, From 41c80ef45bebbaf38225fbf23150ee00e748f008 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:25:17 +0000 Subject: [PATCH 094/182] terraform-providers.oci: 4.117.0 -> 4.118.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8422a9eb7a6f..5168589a573a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -810,11 +810,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-9Qcwxi8TojsDIWeyqwQcagTeTwKS/hkPukjeHANHGfU=", + "hash": "sha256-WtdB5aI5YS5Kc33g3RXh/gneOVXhhhKXq+pW+fm44/I=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.117.0", + "rev": "v4.118.0", "spdx": "MPL-2.0", "vendorHash": null }, From c117314d9b853be5cf2076e385f5bceed697bf69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 03:26:22 +0000 Subject: [PATCH 095/182] terraform-providers.tencentcloud: 1.80.5 -> 1.80.6 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5168589a573a..5ff38844e8d6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1098,11 +1098,11 @@ "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { - "hash": "sha256-kIsH+kp+fnYsZatEJOH51lUdQs9cq/8FtpXHZIRzSM0=", + "hash": "sha256-ZwThN4kqScXumJXrw2s3NoWY/ZgCOrb0JAwiZWX3GIQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.80.5", + "rev": "v1.80.6", "spdx": "MPL-2.0", "vendorHash": null }, From a990678a54e65a41bdaf57c204ca6cbf0b26cc80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 04:29:49 +0000 Subject: [PATCH 096/182] opera: 97.0.4719.43 -> 98.0.4759.6 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index be8a180b326f..6eb2b6f1b5aa 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "97.0.4719.43"; + version = "98.0.4759.6"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-VZVR7oE2GJwVo1M2oHFWuzzyTphJARpeJX/tbAPvwEg="; + hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ="; }; unpackPhase = "dpkg-deb -x $src ."; From e4d34181990187c107f5c7968a3cee6577957ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 26 Apr 2023 21:47:34 -0700 Subject: [PATCH 097/182] warp: 0.5.2 -> 0.5.3 Diff: https://gitlab.gnome.org/World/warp/-/compare/v0.5.2...v0.5.3 --- pkgs/applications/networking/warp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 4ae189595aab..d53e6d6e1f0c 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-VtmLWbZXKTv+sjICnaBt2EPbtDwIVZym/PZdL2N7UQo="; + hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-NT6reZUsieqMTX7HW9QmrjcgBpqxZOUfzht9b7suNeY="; + hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE="; }; nativeBuildInputs = [ From f9afd1f3254fd6b2394a679109db78bf90c47650 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 04:50:04 +0000 Subject: [PATCH 098/182] hamlib_4: 4.5.2 -> 4.5.5 --- pkgs/development/libraries/hamlib/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index ffaa53ccffe2..8fde56729e83 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE="; + sha256 = "sha256-YByJ8y7SJelSet49ZNDQXSMgLAWuIf+nflnXDuRZf80="; }; nativeBuildInputs = [ From 2991a24965dc91b2ec6771476f0bc2bea7ddab72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 04:53:16 +0000 Subject: [PATCH 099/182] eksctl: 0.137.0 -> 0.138.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 85d72b1b56f1..4639fe4df326 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.137.0"; + version = "0.138.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-OTTEJugF/yur3n6LZ1ESJV03DzFEvQ4HXCFUDLrTbYg="; + hash = "sha256-hZnNb6tsgllJUo3lz+qF/d3MQJJ6IauqVl5nG5J3aok="; }; - vendorHash = "sha256-q+xLO1oppamR34TMFEajY/D+3nPcXDW0oeA/pzS8hI0="; + vendorHash = "sha256-ZjA89x+B0pT5jShr1Iv/geBYtH/bYnk/TIQZWLObAck="; doCheck = false; From eb4c0dca7614467ff9e2dbbd219d770d0669ab81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 05:01:18 +0000 Subject: [PATCH 100/182] zsh-forgit: 23.03.0 -> 23.04.0 --- pkgs/shells/zsh/zsh-forgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index d9417a4b8e8f..8873b7b4ff8e 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "23.03.0"; + version = "23.04.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "sha256-merUZ0IQ/qmDkquGFjKvc4vJBj4Ff62JpWYOB67lAVY="; + sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U="; }; strictDeps = true; From 31a5328b2eb6275f2285501f011b8a2b310921aa Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 27 Apr 2023 13:13:36 +0800 Subject: [PATCH 101/182] deepin.deepin-camera: 1.4.8 -> 1.4.11 --- pkgs/desktops/deepin/apps/deepin-camera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index 4e28ff9a20b1..a80381f041d1 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "1.4.8"; + version = "1.4.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM="; + sha256 = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH From 7e151a0527c2754859f8ca1be43994f158ce733c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 27 Apr 2023 03:46:46 +0000 Subject: [PATCH 102/182] skeema: 1.9.0 -> 1.10.0 --- pkgs/tools/system/skeema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 043285497e91..927b50173de5 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-mzxoA5oWX94EdiapSCgyC62RCffuutWzC1YKkGfJSEU="; + hash = "sha256-JhOQKfJCaZc5PlDWPuYe1Ag9AHkw9RjEQ4N9MSda4rY="; }; vendorHash = null; From 2b8f96c360abde583fe8da37c9b82f8ffbd9ded0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 05:44:21 +0000 Subject: [PATCH 103/182] tilt: 0.31.2 -> 0.32.2 --- pkgs/applications/networking/cluster/tilt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ebb28798f55e..d9900e07cbb8 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.31.2"; + version = "0.32.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8="; + sha256 = "sha256-YB/stG+7gxIaB+vMx8PwmUm4W32fCNeRnVrOvOXba5k="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/tilt" ]; From de8e0a71c67f2c693de0d2fbc88b1167af0555b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 05:53:18 +0000 Subject: [PATCH 104/182] devbox: 0.4.6 -> 0.4.8 --- pkgs/development/tools/devbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index a2444607730f..2c48d3ba81fe 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.4.6"; + version = "0.4.8"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-vAfpx4cGN7NxhQbkrhSRxlD+QNfzaiBRtTgyO3e8brU="; + hash = "sha256-Xs7xd2U00AnYlXZv1PYHaSIYhDg+GpCHAtT2xis61vM="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-62cJVlrGdrBSK+yzOA4WiHvplEMuKo09qp95+aX3WY0="; + vendorHash = "sha256-Ct1hftgMYAF8DPdnYTB1QQYD0HGC4wifIbMX+TrgDdk="; nativeBuildInputs = [ installShellFiles ]; From af9916744930248f32abc4294f35509a5d30e274 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 06:40:58 +0000 Subject: [PATCH 105/182] mediainfo: 22.12 -> 23.03 --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 8adfb7453ef5..1f2c6dee6fa4 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "22.12"; + version = "23.03"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w="; + sha256 = "sha256-8GGkJXVlZ2ojS2O91tSX4xcMjkojQaQgu6OcTqi6pJg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 7278814d722a58ee5b78b06d58671273e5c69b49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 06:42:16 +0000 Subject: [PATCH 106/182] ibus-engines.table: 1.16.13 -> 1.17.0 --- pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 97beeadc4853..620ea55e2e55 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.16.13"; + version = "1.17.0"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-hkSUmxBC7n2VTEVfI7rLgdo//xh0iZHxnAmjOayrJu0="; + sha256 = "sha256-6zuSb/oNUAozzUmrIdSR6FH8xXds07MTpRVU4A19chc="; }; postPatch = '' From 3ef6d364b40a2122c917f40034d85b2300eeec69 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 27 Apr 2023 09:44:07 +0300 Subject: [PATCH 107/182] tailscale: 1.38.4 -> 1.40.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 94893b5465e1..fce7a5ad3e73 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.38.4"; + version = "1.40.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-HjN8VzysxQvx5spXgbgbItH3y1bLbfHO+udNQMuyhAk="; + hash = "sha256-iPf3ams613VHPesbxoBaaw9eav5p781+wEmbJ+15yfY="; }; - vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A="; + vendorHash = "sha256-lirn07XE3JOS6oiwZBMwxzywkbXHowOJUMWWLrZtccY="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; From df4b2cb3db2588179b4aeb20b133f1e2908cb499 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 06:53:42 +0000 Subject: [PATCH 108/182] altair: 5.0.22 -> 5.0.23 --- pkgs/development/tools/altair-graphql-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 6bd435750066..af29e7e590b3 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.22"; + version = "5.0.23"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-zbsKj70ESotf4rW3zf60gaZWoXRgPRi4sPv7eIXC/Zg="; + sha256 = "sha256-sjM5KztkFqsZT153b181OLrus5YS09Dp/w4LD6Q6Ros="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 0fb99734cf3c2e08eb9ebac1347f181e194a7936 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 07:07:26 +0000 Subject: [PATCH 109/182] parallel: 20230322 -> 20230422 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index dc1971b465cd..e2da0ba1fd52 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20230322"; + version = "20230422"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-5cexum0MvJ1NxYqj4hyJcMWuSbD9D69Or4vb1gAre8o="; + sha256 = "sha256-kQZZPQncTeDglLexQ5CjCdj8sdJxBKU4FNFpN9y648I="; }; outputs = [ "out" "man" "doc" ]; From b94c7f3acc71784ee952061c5117b9ee8a97d71e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 07:14:15 +0000 Subject: [PATCH 110/182] jetty: 11.0.13 -> 11.0.14 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 9082dceb5021..876189343f23 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "11.0.13"; + version = "11.0.14"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - sha256 = "sha256-RZryj2AJKKv13iwRBVwushOpPFLUj7wd4JIgJ6JVIz4="; + sha256 = "sha256-lmS9B5dXJAc9j/RVs2sqMRaj1C5CN2trTszUXfPfHI4="; }; dontBuild = true; From fc1133dc0ddbbf0927abd51903cc7ea391d25794 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 07:25:52 +0000 Subject: [PATCH 111/182] saga: 9.0.0 -> 9.0.1 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 734cdccbf45a..2bdd5b75ddb6 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -31,11 +31,11 @@ mkDerivation rec { pname = "saga"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-Yi0zYV6RnUy9mx7/jVBXa0POyTqisPqFEFH+BATn2YY="; + sha256 = "sha256-8S8Au+aLwl8X0GbqPPv2Q6EL98KSoT665aILc5vcbpA="; }; sourceRoot = "saga-${version}/saga-gis"; From cb22816835b9ff45c3140b194a7dfcfcfc27ec23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 07:52:22 +0000 Subject: [PATCH 112/182] reaper: 6.77 -> 6.79 --- pkgs/applications/audio/reaper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 60f7cf657fdb..68393ad87ad5 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.77"; + version = "6.79"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-1HQtmhcLV/yhrANy1wLM1ju3t9o/lnU1OaYxqe20UFc="; - aarch64-linux = "sha256-17lBwadEDINoXd0yF/hCVFRGoWq6AuFUf4o+uPR6q60="; + x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0="; + aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU="; }.${stdenv.hostPlatform.system}; }; From 5378f9a6c2d061ebd95b64e95a23d515fa49ffc6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:52:46 +0300 Subject: [PATCH 113/182] gccgo: fix build --- pkgs/development/compilers/gcc/common/configure-flags.nix | 2 +- pkgs/development/compilers/gcc/common/libgcc.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index e0f7ccc7b59a..771c16d84b7b 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -45,7 +45,7 @@ let buildPlatform hostPlatform targetPlatform; # See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903 - disableBootstrap' = disableBootstrap && !langFortran; + disableBootstrap' = disableBootstrap && !langFortran && !langGo; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index 198b5d446b81..312525dcf88f 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -12,7 +12,7 @@ in outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ]; # This is a separate phase because gcc assembles its phase scripts # in bash instead of nix (we should fix that). - preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ]; + preFixupPhases = (previousAttrs.preFixupPhases or []) ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ]; preFixupLibGccPhase = # delete extra/unused builds of libgcc_s in non-langC builds # (i.e. libgccjit, gnat, etc) to avoid potential confusion From 1830443d0ce703fd6c46312bb7dd326fdd3f1e5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:02:07 +0000 Subject: [PATCH 114/182] plantuml: 1.2023.5 -> 1.2023.6 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 17f6d5ac777f..680bd302bb5a 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.5"; + version = "1.2023.6"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-C4ui/YdUIeLADugDuTmyY/5L4Nz+0iGcK3JgWPkU8UM="; + sha256 = "sha256-Ce9e0B+Sb8o7a5rO5RC7f1TzeEjXSC25FdZ3aPLKlu4="; }; nativeBuildInputs = [ makeWrapper ]; From fbd67ea6c177be21703e0794ebed03fe24627adb Mon Sep 17 00:00:00 2001 From: Sinkerine <15cm.github@15cm.net> Date: Thu, 27 Apr 2023 01:13:15 -0700 Subject: [PATCH 115/182] zplug: update the output path (#228284) * zplug: update the output path This is a breaking change because the old behavior pollutes the nix profile root dir with all files in https://github.com/zplug/zplug and needs to be fixed. I created a corresponding PR in the home manager repo https://github.com/nix-community/home-manager/pull/3922. For non HM users, they will need to update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`. * Only add necessary files to $out/share/zplug. Also add the zplug man pages The LICENSE file is not in the 2.4.2 tag and there's not a release after that. I would skip adding the license $out/licenses/zplug in this commit. Reference: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zplug --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/shells/zsh/zplug/default.nix | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index e2ee10c113e4..23199fe74687 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -256,6 +256,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required) - Migration instructions: ["Before updating pnpm to v8 in your CI, regenerate your pnpm-lock.yaml. To upgrade your lockfile, run pnpm install and commit the changes. Existing dependencies will not be updated; however, due to configuration changes in pnpm v8, some missing peer dependencies may be added to the lockfile and some packages may get deduplicated. You can commit the new lockfile even before upgrading Node.js in the CI, as pnpm v7 already supports the new lockfile format."](https://github.com/pnpm/pnpm/releases/tag/v8.0.0) +- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`. + ## Other Notable Changes {#sec-release-23.05-notable-changes} diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix index c6c80ba6a134..7fdc682387d7 100644 --- a/pkgs/shells/zsh/zplug/default.nix +++ b/pkgs/shells/zsh/zplug/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { dontPatch = true; installPhase = '' - mkdir -p $out - cp -r $src/* $out/ + mkdir -p $out/share/zplug + cp -r $src/{autoload,base,bin,init.zsh,misc} $out/share/zplug/ + mkdir -p $out/share/man + cp -r $src/doc/man/* $out/share/man/ ''; meta = with lib; { From b719ba7b67d059793a3312c12dc9b34184d6f85b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:18:43 +0000 Subject: [PATCH 116/182] chezmoi: 2.33.1 -> 2.33.3 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index dc7498506f05..f969a7a37566 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.33.1"; + version = "2.33.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-arZqLkb+J9tSBrZGlqc7KXSABVznRbGoKrMOG3CQeg8="; + hash = "sha256-FHp4sBNuTi0cHECAE2u1DcNUmbo/6plAnPUMs3+OlIE="; }; - vendorHash = "sha256-NU7NmWMUR9jNR8tmEg97o7QMs01aCoYBktj8kUEdBLU="; + vendorHash = "sha256-D1LxpTWqe40/49obXchF1udDQMeDLAk1RVPFiEqYwMg="; doCheck = false; From 8928ef4aefc59b0553686b498756aa5eeb0161fb Mon Sep 17 00:00:00 2001 From: phaer Date: Wed, 26 Apr 2023 15:00:37 +0200 Subject: [PATCH 117/182] termbook: init at 1.4.6 --- pkgs/tools/text/termbook/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/text/termbook/default.nix diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/tools/text/termbook/default.nix new file mode 100644 index 000000000000..3800963f44d2 --- /dev/null +++ b/pkgs/tools/text/termbook/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "termbook-cli"; + version = "1.4.6"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "termbook"; + rev = "v${version}"; + sha256 = "Bo3DI0cMXIfP7ZVr8MAW/Tmv+4mEJBIQyLvRfVBDG8c="; + }; + + cargoSha256 = "sha256-9fFvJJlDzBmbI7hes/wfjAk1Cl2H55T5n8HLnUmDw/c="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "A runner for `mdbooks` to keep your documentation tested"; + homepage = "https://github.com/Byron/termbook/"; + changelog = "https://github.com/Byron/termbook/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ phaer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e4ab3b30a7b..ded9c704d8fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13544,6 +13544,8 @@ with pkgs; xteve = callPackage ../servers/xteve { }; + termbook = callPackage ../tools/text/termbook { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; From 1a7a3206713d84e0da3bdd536d855b03822b57b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:29:26 +0000 Subject: [PATCH 118/182] cudatext: 1.191.5 -> 1.192.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 5547bb8aeb30..55c5aabaa36d 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.191.5"; + version = "1.192.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ="; + hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 97d37f8db2ac..43400ed2c2f9 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.03.22", - "hash": "sha256-cUuoB9hPA04MmurtCbzkMuozc79Dj0rRnqE0ms2jJGs=" + "rev": "2023.04.26", + "hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.04.22", - "hash": "sha256-12W0p18s15KFFIopgit8l/Bf1KjMZkP2kCAaeaoqfyQ=" + "rev": "2023.04.26", + "hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.04.08", - "hash": "sha256-xm2fMAm0DF0hILxBQ2m+OSodQQgl5a4rkW0pgTDjuoo=" + "rev": "2023.04.26", + "hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk=" }, "EControl": { "owner": "Alexey-T", From 45081f74a527702c81961cab6dca39bba67a4476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:29:48 +0000 Subject: [PATCH 119/182] mark: 8.9 -> 9.1.4 --- pkgs/tools/text/mark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index cc743cec8b82..33d6072c8c81 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "8.9"; + version = "9.1.4"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-mtATdRUNTBXy/r7VoxHi1SNTv8fGz7svil6dOkqq5Bk="; + sha256 = "sha256-nAgEegtRT4c2wJzVOY41JgM/JVW5xQjRnhXUzjwqxLY="; }; - vendorHash = "sha256-V14i+8h0HxxHVDNfgaHUxdzEnB+mKL5iGjBwMjPDZ9s="; + vendorHash = "sha256-2rEwZffM+RK0baz8m+fXN2NGYskv4zO67cWC4rx+hfI="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From a110875cffacbd8bff54d39f1ca36c34d55dba12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:39:05 +0000 Subject: [PATCH 120/182] checkSSLCert: 2.64.0 -> 2.66.0 --- pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 629bf2e3b7a5..7aa41d77146a 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.64.0"; + version = "2.66.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-/5ozeabGqFpEfBi2WVRHUpaSwQjvuq8RRw2hNDp8j34="; + hash = "sha256-sk0t/oy8YsTcYSMKtSsC3apGp8LNa9AUggHrHKd75pw="; }; nativeBuildInputs = [ From 785d917d12a9680458ebd0b3df23c82c69f3d8eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 08:48:13 +0000 Subject: [PATCH 121/182] cloud-nuke: 0.29.4 -> 0.29.7 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 5ae0da1a1ef1..94d9c5155dcb 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.29.4"; + version = "0.29.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - hash = "sha256-qQrgeUmsCOLlmeU4kwtovo/3cK9Vqzeng7W9M+j+hdk="; + hash = "sha256-JIMEmXZVPXDR8t+ECaV5OqThHiW2CUn2BrIvM+uxSMI="; }; - vendorHash = "sha256-6+uQAEp+fRlRrwfJR0eDMXs0mEQwzWadLxCrXrDREhs="; + vendorHash = "sha256-i+AzDEydK+mUvOb6LivuyaCqHaqIdPkE46nxvf7mLTw="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 9d9fa0066443d94fddd9db53737f1af53fa7245c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 27 Apr 2023 11:05:03 +0200 Subject: [PATCH 122/182] mattermost: 7.8.1 -> 7.8.3 Fixes CVE-2023-1831 / MMSA-2023-00146, MMSA-2023-00160 and MMSA-2023-00162. Changelogs: https://docs.mattermost.com/install/self-managed-changelog.html#release-v7-8-extended-support-release --- pkgs/servers/mattermost/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 7439396969f4..e18bff1d3f78 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -7,21 +7,21 @@ buildGoModule rec { pname = "mattermost"; - version = "7.8.1"; + version = "7.8.3"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-6aJkJCJmQHvSn5SHIPXj0nNLBuEez9BCYYMMlv3iZqQ="; + hash = "sha256-MJAYKBMQEf82YkDOpLHnL7Jxlz6i0K0B8E99pRxGHgc="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-KmzjhAkv1TpOlHtZnN/ifkQnzDqk1rN+fl4JStZRbXQ="; + hash = "sha256-4VOEDrCKZI5HR5U2m49Dfbs5Mc+i8l4N41jIy8+5D1k="; }; - vendorSha256 = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk="; + vendorHash = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk="; subPackages = [ "cmd/mattermost" ]; From 6aef3624a7a54959e0e4642e823f4d7fd84008f3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 12:12:58 +0300 Subject: [PATCH 123/182] tinygltf: 2.8.3 -> 2.8.7 --- pkgs/development/libraries/tinygltf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index fa9d79aed1a7..4f965c653850 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.8.3"; + version = "2.8.7"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg="; + hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4="; }; nativeBuildInputs = [ cmake ]; From 646d91b53401b19e095214a4bbd312f0e3f09101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 09:18:18 +0000 Subject: [PATCH 124/182] jotta-cli: 0.15.75988 -> 0.15.80533 --- pkgs/applications/misc/jotta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 28451b3c2e4f..d128c8cc6925 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.75988"; + version = "0.15.80533"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc="; + sha256 = "sha256-4Knenhuezc+hKqVVY/l5d7SNfiAHyxspwGEgJj++GQM="; stripRoot = false; }; From 2ed6b1b9f99a42539e3d9cba028cdbbbdfdbea83 Mon Sep 17 00:00:00 2001 From: sandydoo Date: Wed, 26 Apr 2023 08:57:29 +0000 Subject: [PATCH 125/182] python3Packages.binary: init at 1.0.0 --- .../python-modules/binary/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/binary/default.nix diff --git a/pkgs/development/python-modules/binary/default.nix b/pkgs/development/python-modules/binary/default.nix new file mode 100644 index 000000000000..9311289b7cc2 --- /dev/null +++ b/pkgs/development/python-modules/binary/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "binary"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bsAQ5Y9zMevIvJY42+bGbWNd5g1YGLByO+9N6tDsKKY="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "binary" "binary.core" ]; + + meta = with lib; { + description = "Easily convert between binary and SI units (kibibyte, kilobyte, etc.)"; + homepage = "https://github.com/ofek/binary"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c94f88f841f..0910ddca6a35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1286,6 +1286,8 @@ self: super: with self; { bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; + binary = callPackage ../development/python-modules/binary { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; bincopy = callPackage ../development/python-modules/bincopy { }; From b4dff837563acd7589e1713742216b58142002d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 09:25:01 +0000 Subject: [PATCH 126/182] sfeed: 1.7 -> 1.8 --- pkgs/tools/misc/sfeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 80ff75736227..02813960ea6c 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.7"; + version = "1.8"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-W9AQc3Y3do1M2GM7LQVM5SN07LoWaZL7GTQD+SmQRwQ="; + sha256 = "sha256-oosBwLCVZDy29RNxLXie0IPRUxAmT6qJlQGHypWScuk="; }; buildInputs = [ ncurses ]; From 376eadb5eb655540a7ed9f20945f7b40bb964017 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 27 Apr 2023 09:54:20 +0000 Subject: [PATCH 127/182] =?UTF-8?q?gnome.ghex:=2044.0=20=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/ghex/-/compare/44.0...44.1 --- pkgs/desktops/gnome/apps/ghex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 96c1633b8da5..36aad3edaac3 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "WKpHz9vtEoCjwTGVHBokWWEpQEoLDTR6Pb//tv9oOXY="; + sha256 = "QEvfZJ6qE5IqgK4y8Z/kDnHw7g9GHEXtrHKIigDq1sI="; }; nativeBuildInputs = [ From 5810bab503be88e17fe3f82f15bdf9e135ca5249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 09:55:48 +0000 Subject: [PATCH 128/182] kdiff3: 1.10.0 -> 1.10.1 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index b5100570648f..7877d7d8d3d2 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-s/l+Gz6BF1VKeljVj48PaT/wMKQrvLcwj7RPhZWM1Ss="; + sha256 = "sha256-IFQ0kw9nU2wgUZFir33fQ1hG4qGhJdegmG9M4n+bM8g="; }; buildInputs = [ boost ]; From ede084fa150389810221b49441f5d4566b0a18ac Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Thu, 27 Apr 2023 10:01:15 +0000 Subject: [PATCH 129/182] python38Packages.cryptography: fix build with libxcrypt --- pkgs/development/python-modules/cryptography/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 578d13acf43d..e9162fa6428f 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -18,6 +18,7 @@ , pythonOlder , pretend , libiconv +, libxcrypt , iso8601 , py , pytz @@ -56,7 +57,8 @@ buildPythonPackage rec { ] ++ (with rustPlatform; [ rust.cargo rust.rustc ]); buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + ++ lib.optionals stdenv.isDarwin [ Security libiconv ] + ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi From 708890261178939288ed57ebda3f2a2dd03393ff Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Thu, 27 Apr 2023 12:53:55 +0200 Subject: [PATCH 130/182] maintainers: Update evenbrenden email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d24939f27b37..f6fe80e2f422 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4859,7 +4859,7 @@ name = "Eric Evenchick"; }; evenbrenden = { - email = "evenbrenden@gmail.com"; + email = "packages@anythingexternal.com"; github = "evenbrenden"; githubId = 2512008; name = "Even Brenden"; From 831478b07458301f1cf3544318d6708126eebdbe Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 27 Apr 2023 12:41:07 +0100 Subject: [PATCH 131/182] chatblade: 0.2.1 -> 0.2.3 --- pkgs/applications/misc/chatblade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index aee760a31fa9..a96f68c57137 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.2.1"; + version = "0.2.3"; format = "setuptools"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-1syZyqdv+0iyAOWDychv3bGnkHs9SCxsEotxQ+G1UPo="; + sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk="; }; doCheck = false; # there are no tests From f13c8704bc25835b49019e87bba0b52393f3f920 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 12:01:46 +0000 Subject: [PATCH 132/182] python310Packages.pylsqpack: 0.3.16 -> 0.3.17 --- pkgs/development/python-modules/pylsqpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index 73e54377e66c..3c2eba13d2b9 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pylsqpack"; - version = "0.3.16"; + version = "0.3.17"; src = fetchPypi { inherit pname version; - hash = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; + hash = "sha256-LyB3jblW3H5LGop5ci1XpGUMRZl/tlwTUsv4XreqPOI="; }; nativeCheckInputs = [ pytestCheckHook ]; From 19a929866c09bcea91db7b00816e9ba778affffd Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 27 Apr 2023 14:49:53 +0200 Subject: [PATCH 133/182] grafana: 9.4.7 -> 9.5.1 Fixes CVE-2023-1387 and pull fixed dependency for CVE-2023-28119. Release notes: https://grafana.com/blog/2023/04/26/grafana-9.5-release/ Security advisory: https://grafana.com/blog/2023/04/26/grafana-security-release-new-versions-of-grafana-with-security-fixes-for-cve-2023-28119-and-cve-2023-1387/ --- pkgs/servers/monitoring/grafana/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 068154b601d1..008bf25ae6d2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: buildGoModule rec { pname = "grafana"; - version = "9.4.7"; + version = "9.5.1"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,23 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-vhGFZjxO20M3fQhXlEDDkad/yOyFOu48sHZ63MEnWIA="; + hash = "sha256-uYmbW7+h4dr2LlLpQ2kefcTZ+WdW56JwneTwj9BCIkU="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0="; + hash = "sha256-2bdQXN1CmcGDXDZUf/4uYtOw7HYA3KLGRKBRlXLJw4c="; }; - patches = [ - (fetchpatch { # https://github.com/grafana/grafana/pull/65790 - name = "fix-TestIntegrationAMConfigAccess.patch"; - url = "https://github.com/grafana/grafana/commit/8500eb1c180b4d49a8e17bfd6df675d821d038a4.diff"; - sha256 = "sha256-TWPn9fLjmCbXGXkxAc3NLTN+0XXjsaspaV4gYKg3+Mk="; - }) - ]; - - vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM="; + vendorHash = "sha256-b965ODZM0DgF8ZNrqa+Pwq8NE2qjePI9pBe2TgOVqwQ="; nativeBuildInputs = [ wire ]; From 0d11b477754a4fa27f4723026e80413b8843c9ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 12:51:21 +0000 Subject: [PATCH 134/182] vgmtools: unstable-2023-01-27 -> unstable-2023-04-17 --- pkgs/tools/audio/vgmtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index e0a14a82124c..1233974bf841 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-01-27"; + version = "unstable-2023-04-17"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "fc55484b5902191e5467e6044bb90c1c74a0c938"; - sha256 = "Ho0yYoe1TIlVxMauz/harP1xSw42wdcklj/O6fA+VEk="; + rev = "894fb43d584e31efe0c7070ba9b6b85938012745"; + sha256 = "BGL7Lm6U1QdYZgEnn9tGgY+z8Fhjj+Sd2Cesn1sxWhY="; }; nativeBuildInputs = [ From fd2c8bfaa356ca0b7001cd49d7a1578eaeaf5dce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 12:57:02 +0000 Subject: [PATCH 135/182] imgproxy: 3.15.0 -> 3.16.0 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index adc4459bd7a8..8cca579af7c8 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.15.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-Y0QxjIY8ac/6MAdqKDEv3/et1+ysCMkV522jxDP72Js="; + sha256 = "sha256-TdJRoburmJl2Ez0wzJnqm2jpJpFOSOmaBx0O9Z/8DXQ="; rev = "v${version}"; }; - vendorHash = "sha256-6rEGuuw3UJyWeaIm9v5P8/V0Nxd9ySe0PCf0rWRDB9s="; + vendorHash = "sha256-EtNFSAx8YcRhzgV3IdrZaCM6fOd284iuTperCFECsL8="; nativeBuildInputs = [ pkg-config ]; From 9d136b7467bd2bde6338ab98cff8056499c7e83e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 27 Apr 2023 14:58:40 +0200 Subject: [PATCH 136/182] ldtk: 1.2.5 -> 1.3.0 --- pkgs/applications/editors/ldtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 3e6346f57e41..8d6ec620e5c4 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ldtk"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; - sha256 = "sha256-kx4GOENYYbS09HxAiCCvqm/ztc32sdB39W8uv6D+R+A="; + hash = "sha256-2gGxl6l7J/L0CfMJk6PVmc1ABQISzAnjKDJgnMyx2PM="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; From d92e42073fc2297482ed57f314392b1911c506fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 13:02:52 +0000 Subject: [PATCH 137/182] xurls: 2.4.0 -> 2.5.0 --- pkgs/tools/text/xurls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 4da65d9af027..dc0825b88d4f 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "xurls"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "sha256-lyDcwbdVKyFRfsYCcPAgIgvrEEdwK0lxmJTvMJcFBCw="; + sha256 = "sha256-9hPXZ/t15+LG9fji1gyeWhUrYOr6eGyKYg3a1SmHJpQ="; }; - vendorSha256 = "sha256-lJzgJxW/GW3J09uKQGoEX+UsHnB1pGG71U/zy4b9rXo="; + vendorHash = "sha256-eVK7qU+NWsarBsEpg6aGow/urmhIpU3Z9RwoTvSymXo="; ldflags = [ "-s" "-w" ]; From ebb1fb926ae4db2c07cd3329e8715affa39411b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 27 Apr 2023 15:03:22 +0200 Subject: [PATCH 138/182] ldtk: add meta.changelog --- pkgs/applications/editors/ldtk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 8d6ec620e5c4..ef21add4b32e 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://ldtk.io/"; description = "Modern, lightweight and efficient 2D level editor"; + homepage = "https://ldtk.io/"; + changelog = "https://github.com/deepnight/ldtk/releases/tag/v${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ felschr ]; From 50e9c77b207ee8b16ed8290ca98306a366b8fbe9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 27 Apr 2023 15:02:51 +0200 Subject: [PATCH 139/182] grafana-image-renderer: regenerate yarn deps, remove obsolete sharp hack --- .../grafana-image-renderer/default.nix | 15 +- .../grafana-image-renderer/package.json | 57 +- .../grafana-image-renderer/yarn.lock | 1367 +++++++---------- .../grafana-image-renderer/yarn.nix | 1200 ++++++--------- 4 files changed, 1001 insertions(+), 1638 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 9d8c155cbb1a..e9641b9f7a20 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -1,12 +1,7 @@ -{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell -, nodePackages, python3, vips, glib, pkg-config -}: +{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }: # Notes for the upgrade: # * Download the tarball of the new version to use. -# * Remove the `resolutions`-section from upstream `package.json` -# as this breaks with `yarn2nix`. -# * Regenerate `yarn.lock` and `yarn2nix --no-patch`. # * Replace new `package.json`, `yarn.nix`, `yarn.lock` here. # * Update `version`+`hash` and rebuild. @@ -37,14 +32,6 @@ mkYarnPackage rec { yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; - pkgConfig.sharp = { - nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ]; - buildInputs = [ glib vips ]; - postInstall = '' - node-gyp rebuild - ''; - }; - distPhase = '' runHook preDist diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 35445f85e4d8..6b55fb74409d 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -20,52 +20,55 @@ "create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp" }, "dependencies": { - "@grpc/grpc-js": "^1.0", - "@grpc/proto-loader": "^0.5.4", - "@hapi/boom": "^9.1.0", + "@grpc/grpc-js": "^1.7.0", + "@grpc/proto-loader": "^0.7.2", + "@hapi/boom": "^10.0.0", "chokidar": "^3.5.2", + "dompurify": "^2.4.0", "express": "^4.16.3", - "express-prom-bundle": "^5.1.5", - "google-protobuf": "3.5.0", - "jimp": "0.16.1", + "express-prom-bundle": "^6.5.0", + "google-protobuf": "3.21.0", + "jimp": "^0.16.13", + "jsdom": "20.0.0", "lodash": "^4.17.21", "minimist": "^1.2.6", "morgan": "^1.9.0", + "multer": "^1.4.5-lts.1", "on-finished": "^2.3.0", "poolpeteer": "^0.23.0", - "prom-client": "^11.5.3", - "puppeteer": "^13.1.3", + "prom-client": "^14.1.0", + "puppeteer": "^17.1.3", "puppeteer-cluster": "^0.23.0", - "unique-filename": "^1.1.0", - "winston": "^3.2.1", - "jsdom": "19.0.0", - "dompurify": "^2.3.8", - "multer": "^1.4.5-lts.1" + "unique-filename": "^2.0.1", + "winston": "^3.8.2" }, "devDependencies": { "@grafana/eslint-config": "5.0.0", - "@types/multer": "1.4.7", - "@types/express": "^4.11.1", - "@types/node": "^14.14.41", "@types/dompurify": "2.3.4", + "@types/express": "^4.17.14", "@types/jsdom": "20.0.0", - "@typescript-eslint/eslint-plugin": "5.16.0", - "@typescript-eslint/parser": "5.31.0", - "axios": "0.26.0", + "@types/multer": "1.4.7", + "@types/node": "^18.7.18", + "@typescript-eslint/eslint-plugin": "5.37.0", + "@typescript-eslint/parser": "5.37.0", + "axios": "0.27.2", "cross-env": "7.0.3", - "eslint": "8.22.0", + "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", - "eslint-plugin-jsdoc": "39.3.3", + "eslint-plugin-jsdoc": "39.3.6", "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-react": "7.31.0", + "eslint-plugin-react": "7.31.8", "eslint-plugin-react-hooks": "4.6.0", - "husky": "4.3.8", + "husky": "8.0.1", "lint-staged": "13.0.3", - "pkg": "5.8.0", - "prettier": "2.2.1", - "ts-node": "10.5.0", + "pkg": "5.8.1", + "prettier": "2.7.1", + "ts-node": "10.9.1", "tsc-watch": "5.0.3", - "typescript": "4.7.4" + "typescript": "4.8.3" + }, + "resolutions": { + "jpeg-js": "^0.4.4" }, "lint-staged": { "*.ts": [ diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index 25ea4c244adc..3753032a0769 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -2,13 +2,6 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - "@babel/generator@7.18.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" @@ -23,19 +16,10 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56" integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw== -"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076" - integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g== - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" +"@babel/helper-validator-identifier@^7.18.6": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== "@babel/parser@7.18.4": version "7.18.4" @@ -43,24 +27,16 @@ integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== "@babel/runtime@^7.7.2": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" - integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" + integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== dependencies: regenerator-runtime "^0.13.4" -"@babel/types@7.18.4": - version "7.18.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" - integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.18.2": - version "7.18.13" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a" - integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ== +"@babel/types@7.19.0", "@babel/types@^7.18.2": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz#75f21d73d73dc0351f3368d28db73465f4814600" + integrity sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA== dependencies: "@babel/helper-string-parser" "^7.18.10" "@babel/helper-validator-identifier" "^7.18.6" @@ -71,17 +47,12 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== - -"@cspotcode/source-map-support@0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" - integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== dependencies: - "@cspotcode/source-map-consumer" "0.8.0" + "@jridgewell/trace-mapping" "0.3.9" "@dabh/diagnostics@^2.0.2": version "2.0.3" @@ -110,10 +81,10 @@ esquery "^1.4.0" jsdoc-type-pratt-parser "~3.1.0" -"@eslint/eslintrc@^1.2.1", "@eslint/eslintrc@^1.3.0": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d" - integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ== +"@eslint/eslintrc@^1.2.1", "@eslint/eslintrc@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz#58b69582f3b7271d8fa67fe5251767a5b38ea356" + integrity sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -139,23 +110,15 @@ eslint-plugin-react-hooks "4.3.0" typescript "4.6.4" -"@grpc/grpc-js@^1.0": - version "1.6.11" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.11.tgz#74c04cde0cde4e8a88ffc514bd9cd1bb307815b9" - integrity sha512-e/adiPjUxf5cKYiAlV4m+0jJS4k6g2w78X7WTZB3ISOBzcCwm+cwjB2dSRfBHbu46inGGzQMmWAmsgYLg8yT5g== +"@grpc/grpc-js@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.0.tgz#5a96bdbe51cce23faa38a4db6e43595a5c584849" + integrity sha512-wvKxal+40Xx11DXO2q5PfY3UiE25iwTb8SOz6A9IJII/V7d19x2ex0he+GJfVW0JZCaBjCPSjUB0yU9Ecm4WCw== dependencies: "@grpc/proto-loader" "^0.7.0" "@types/node" ">=12.12.47" -"@grpc/proto-loader@^0.5.4": - 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" - -"@grpc/proto-loader@^0.7.0": +"@grpc/proto-loader@^0.7.0", "@grpc/proto-loader@^0.7.2": version "0.7.2" resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.2.tgz#fa63178853afe1473c50cff89fe572f7c8b20154" integrity sha512-jCdyLIT/tdQ1zhrbTQnJNK5nbDf0GoBpy5jVNywBzzMDF+Vs6uEaHnfz46dMtDxkvwrF2hzk5Z67goliceH0sA== @@ -166,17 +129,17 @@ protobufjs "^7.0.0" yargs "^16.2.0" -"@hapi/boom@^9.1.0": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" - integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== +"@hapi/boom@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-10.0.0.tgz#3624831d0a26b3378423b246f50eacea16e04a08" + integrity sha512-1YVs9tLHhypBqqinKQRqh7FUERIolarQApO37OWkzD+z6y6USi871Sv746zBPKcIOBuI6g6y4FrwX87mmJ90Gg== dependencies: - "@hapi/hoek" "9.x.x" + "@hapi/hoek" "10.x.x" -"@hapi/hoek@9.x.x": - version "9.3.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" - integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== +"@hapi/hoek@10.x.x": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-10.0.1.tgz#ee9da297fabc557e1c040a0f44ee89c266ccc306" + integrity sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw== "@humanwhocodes/config-array@^0.10.4": version "0.10.4" @@ -201,297 +164,302 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA== +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@jimp/bmp@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.1.tgz#6e2da655b2ba22e721df0795423f34e92ef13768" - integrity sha512-iwyNYQeBawrdg/f24x3pQ5rEx+/GwjZcCXd3Kgc+ZUd+Ivia7sIqBsOnDaMZdKCBPlfW364ekexnlOqyVa0NWg== +"@jimp/bmp@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.13.tgz#57ffa5b17417b5a181f6f184bdabc8218e8448ef" + integrity sha512-9edAxu7N2FX7vzkdl5Jo1BbACfycUtBQX+XBMcHA2bk62P8R0otgkHg798frgAk/WxQIzwxqOH6wMiCwrlAzdQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" bmp-js "^0.1.0" -"@jimp/core@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.1.tgz#68c4288f6ef7f31a0f6b859ba3fb28dae930d39d" - integrity sha512-la7kQia31V6kQ4q1kI/uLimu8FXx7imWVajDGtwUG8fzePLWDFJyZl0fdIXVCL1JW2nBcRHidUot6jvlRDi2+g== +"@jimp/core@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.13.tgz#7171745a912b5b847f8bf53e70b0672c5ca92744" + integrity sha512-qXpA1tzTnlkTku9yqtuRtS/wVntvE6f3m3GNxdTdtmc+O+Wcg9Xo2ABPMh7Nc0AHbMKzwvwgB2JnjZmlmJEObg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" any-base "^1.1.0" buffer "^5.2.0" exif-parser "^0.1.12" - file-type "^9.0.0" + file-type "^16.5.4" load-bmfont "^1.3.1" mkdirp "^0.5.1" phin "^2.9.1" pixelmatch "^4.0.2" tinycolor2 "^1.4.1" -"@jimp/custom@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.1.tgz#28b659c59e20a1d75a0c46067bd3f4bd302cf9c5" - integrity sha512-DNUAHNSiUI/j9hmbatD6WN/EBIyeq4AO0frl5ETtt51VN1SvE4t4v83ZA/V6ikxEf3hxLju4tQ5Pc3zmZkN/3A== +"@jimp/custom@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.13.tgz#2e4ed447b7410b81fe9103682b4166af904daf84" + integrity sha512-LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/core" "^0.16.1" + "@jimp/core" "^0.16.13" -"@jimp/gif@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.1.tgz#d1f7c3a58f4666482750933af8b8f4666414f3ca" - integrity sha512-r/1+GzIW1D5zrP4tNrfW+3y4vqD935WBXSc8X/wm23QTY9aJO9Lw6PEdzpYCEY+SOklIFKaJYUAq/Nvgm/9ryw== +"@jimp/gif@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.13.tgz#fa72f35d8ad67d6ce3a3d7ef6c8d04a462afaaf9" + integrity sha512-yFAMZGv3o+YcjXilMWWwS/bv1iSqykFahFMSO169uVMtfQVfa90kt4/kDwrXNR6Q9i6VHpFiGZMlF2UnHClBvg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" gifwrap "^0.9.2" omggif "^1.0.9" -"@jimp/jpeg@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.1.tgz#3b7bb08a4173f2f6d81f3049b251df3ee2ac8175" - integrity sha512-8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w== +"@jimp/jpeg@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.13.tgz#e1c128a591bd7f8a26c8731fd0bc65d32d4ba32a" + integrity sha512-BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" - jpeg-js "0.4.2" + "@jimp/utils" "^0.16.13" + jpeg-js "^0.4.2" -"@jimp/plugin-blit@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz#09ea919f9d326de3b9c2826fe4155da37dde8edb" - integrity sha512-fKFNARm32RoLSokJ8WZXHHH2CGzz6ire2n1Jh6u+XQLhk9TweT1DcLHIXwQMh8oR12KgjbgsMGvrMVlVknmOAg== +"@jimp/plugin-blit@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz#370303edef02b75aa3e316726c5a3aac3e92f5d0" + integrity sha512-8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-blur@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz#e614fa002797dcd662e705d4cea376e7db968bf5" - integrity sha512-1WhuLGGj9MypFKRcPvmW45ht7nXkOKu+lg3n2VBzIB7r4kKNVchuI59bXaCYQumOLEqVK7JdB4glaDAbCQCLyw== +"@jimp/plugin-blur@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz#27b82295a3dee88d6e029d4d62f5de8118b845e6" + integrity sha512-PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-circle@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz#20e3194a67ca29740aba2630fd4d0a89afa27491" - integrity sha512-JK7yi1CIU7/XL8hdahjcbGA3V7c+F+Iw+mhMQhLEi7Q0tCnZ69YJBTamMiNg3fWPVfMuvWJJKOBRVpwNTuaZRg== +"@jimp/plugin-circle@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.13.tgz#d7af61a95b17e67c7fd4361cd1d588e00b58b6b6" + integrity sha512-RNave7EFgZrb5V5EpdvJGAEHMnDAJuwv05hKscNfIYxf0kR3KhViBTDy+MoTnMlIvaKFULfwIgaZWzyhuINMzA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-color@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.1.tgz#0f298ba74dee818b663834cd80d53e56f3755233" - integrity sha512-9yQttBAO5SEFj7S6nJK54f+1BnuBG4c28q+iyzm1JjtnehjqMg6Ljw4gCSDCvoCQ3jBSYHN66pmwTV74SU1B7A== +"@jimp/plugin-color@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.13.tgz#825227e7e6f32d227740ad1bd97c389083c1d0d1" + integrity sha512-xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" tinycolor2 "^1.4.1" -"@jimp/plugin-contain@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz#3c5f5c495fd9bb08a970739d83694934f58123f2" - integrity sha512-44F3dUIjBDHN+Ym/vEfg+jtjMjAqd2uw9nssN67/n4FdpuZUVs7E7wadKY1RRNuJO+WgcD5aDQcsvurXMETQTg== +"@jimp/plugin-contain@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.13.tgz#7a42ed1ce580bf910f812ba2f35e0fa2cfe501ac" + integrity sha512-QayTXw4tXMwU6q6acNTQrTTFTXpNRBe+MgTGMDU0lk+23PjlFCO/9sacflelG8lsp7vNHhAxFeHptDMAksEYzg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-cover@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz#0e8caec16a40abe15b1b32e5383a603a3306dc41" - integrity sha512-YztWCIldBAVo0zxcQXR+a/uk3/TtYnpKU2CanOPJ7baIuDlWPsG+YE4xTsswZZc12H9Kl7CiziEbDtvF9kwA/Q== +"@jimp/plugin-cover@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.13.tgz#9c964be05b163e0f0e06866a9afcebe775dff246" + integrity sha512-BSsP71GTNaqWRcvkbWuIVH+zK7b3TSNebbhDkFK0fVaUTzHuKMS/mgY4hDZIEVt7Rf5FjadAYtsujHN9w0iSYA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-crop@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz#b362497c873043fe47ba881ab08604bf7226f50f" - integrity sha512-UQdva9oQzCVadkyo3T5Tv2CUZbf0klm2cD4cWMlASuTOYgaGaFHhT9st+kmfvXjKL8q3STkBu/zUPV6PbuV3ew== +"@jimp/plugin-crop@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz#80c6ae4d401a8de6cc11b265f3cdecd80425b9a9" + integrity sha512-WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-displace@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz#4dd9db518c3e78de9d723f86a234bf98922afe8d" - integrity sha512-iVAWuz2+G6Heu8gVZksUz+4hQYpR4R0R/RtBzpWEl8ItBe7O6QjORAkhxzg+WdYLL2A/Yd4ekTpvK0/qW8hTVw== +"@jimp/plugin-displace@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.13.tgz#fd72aa93b3fe97a1c3da729e6b26399661ce8ce5" + integrity sha512-qt9WKq8vWrcjySa9DyQ0x/RBMHQeiVjdVSY1SJsMjssPUf0pS74qorcuAkGi89biN3YoGUgPkpqECnAWnYwgGA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-dither@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz#b47de2c0bb09608bed228b41c3cd01a85ec2d45b" - integrity sha512-tADKVd+HDC9EhJRUDwMvzBXPz4GLoU6s5P7xkVq46tskExYSptgj5713J5Thj3NMgH9Rsqu22jNg1H/7tr3V9Q== +"@jimp/plugin-dither@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.13.tgz#430750f73d528df7ebe21bb508fb80f9f515305d" + integrity sha512-5/N3yJggbWQTlGZHQYJPmQXEwR52qaXjEzkp1yRBbtdaekXE3BG/suo0fqeoV/csf8ooI78sJzYmIrxNoWVtgQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-fisheye@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz#f625047b6cdbe1b83b89e9030fd025ab19cdb1a4" - integrity sha512-BWHnc5hVobviTyIRHhIy9VxI1ACf4CeSuCfURB6JZm87YuyvgQh5aX5UDKtOz/3haMHXBLP61ZBxlNpMD8CG4A== +"@jimp/plugin-fisheye@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.13.tgz#caf69851ab25c44d13c952880a8e43c928abd3f1" + integrity sha512-2rZmTdFbT/cF9lEZIkXCYO0TsT114Q27AX5IAo0Sju6jVQbvIk1dFUTnwLDadTo8wkJlFzGqMQ24Cs8cHWOliA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-flip@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz#7a99ea22bde802641017ed0f2615870c144329bb" - integrity sha512-KdxTf0zErfZ8DyHkImDTnQBuHby+a5YFdoKI/G3GpBl3qxLBvC+PWkS2F/iN3H7wszP7/TKxTEvWL927pypT0w== +"@jimp/plugin-flip@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.13.tgz#3dd167e14d03d62410c519990728ac3c247c0692" + integrity sha512-EmcgAA74FTc5u7Z+hUO/sRjWwfPPLuOQP5O64x5g4j0T12Bd29IgsYZxoutZo/rb3579+JNa/3wsSEmyVv1EpA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-gaussian@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz#0845e314085ccd52e34fad9a83949bc0d81a68e8" - integrity sha512-u9n4wjskh3N1mSqketbL6tVcLU2S5TEaFPR40K6TDv4phPLZALi1Of7reUmYpVm8mBDHt1I6kGhuCJiWvzfGyg== +"@jimp/plugin-gaussian@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.13.tgz#79879d9371aff3e1714c54be0771418573ac2954" + integrity sha512-A1XKfGQD0iDdIiKqFYi8nZMv4dDVYdxbrmgR7y/CzUHhSYdcmoljLIIsZZM3Iks/Wa353W3vtvkWLuDbQbch1w== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-invert@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz#7e6f5a15707256f3778d06921675bbcf18545c97" - integrity sha512-2DKuyVXANH8WDpW9NG+PYFbehzJfweZszFYyxcaewaPLN0GxvxVLOGOPP1NuUTcHkOdMFbE0nHDuB7f+sYF/2w== +"@jimp/plugin-invert@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.13.tgz#7449283d5b0f405ce2cd1b93a6d79169c970e431" + integrity sha512-xFMrIn7czEZbdbMzZWuaZFnlLGJDVJ82y5vlsKsXRTG2kcxRsMPXvZRWHV57nSs1YFsNqXSbrC8B98n0E32njQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-mask@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz#e7f2460e05c3cda7af5e76f33ccb0579f66f90df" - integrity sha512-snfiqHlVuj4bSFS0v96vo2PpqCDMe4JB+O++sMo5jF5mvGcGL6AIeLo8cYqPNpdO6BZpBJ8MY5El0Veckhr39Q== +"@jimp/plugin-mask@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.13.tgz#70b4bef4a598e41571f9a3e0c33fcc730eeae24d" + integrity sha512-wLRYKVBXql2GAYgt6FkTnCfE+q5NomM7Dlh0oIPGAoMBWDyTx0eYutRK6PlUrRK2yMHuroAJCglICTbxqGzowQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-normalize@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz#032dfd88eefbc4dedc8b1b2d243832e4f3af30c8" - integrity sha512-dOQfIOvGLKDKXPU8xXWzaUeB0nvkosHw6Xg1WhS1Z5Q0PazByhaxOQkSKgUryNN/H+X7UdbDvlyh/yHf3ITRaw== +"@jimp/plugin-normalize@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.13.tgz#fd7c802c3f6be8d34abf0dbeadfe1d783e531d67" + integrity sha512-3tfad0n9soRna4IfW9NzQdQ2Z3ijkmo21DREHbE6CGcMIxOSvfRdSvf1qQPApxjTSo8LTU4MCi/fidx/NZ0GqQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-print@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.1.tgz#66b803563f9d109825970714466e6ab9ae639ff6" - integrity sha512-ceWgYN40jbN4cWRxixym+csyVymvrryuKBQ+zoIvN5iE6OyS+2d7Mn4zlNgumSczb9GGyZZESIgVcBDA1ezq0Q== +"@jimp/plugin-print@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.13.tgz#595fb6db6677ac3d2b6bfe7144658019791bf288" + integrity sha512-0m6i3p01PGRkGAK9r53hDYrkyMq+tlhLOIbsSTmZyh6HLshUKlTB7eXskF5OpVd5ZUHoltlNc6R+ggvKIzxRFw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" load-bmfont "^1.4.0" -"@jimp/plugin-resize@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz#65e39d848ed13ba2d6c6faf81d5d590396571d10" - integrity sha512-u4JBLdRI7dargC04p2Ha24kofQBk3vhaf0q8FwSYgnCRwxfvh2RxvhJZk9H7Q91JZp6wgjz/SjvEAYjGCEgAwQ== +"@jimp/plugin-resize@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz#6267087f724d47e7bb8824c5b842d9315f50b8e7" + integrity sha512-qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-rotate@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz#53fb5d51a4b3d05af9c91c2a8fffe5d7a1a47c8c" - integrity sha512-ZUU415gDQ0VjYutmVgAYYxC9Og9ixu2jAGMCU54mSMfuIlmohYfwARQmI7h4QB84M76c9hVLdONWjuo+rip/zg== +"@jimp/plugin-rotate@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz#9981f24631b1a0ad486d2b75a0163918ff912491" + integrity sha512-Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-scale@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz#89f6ba59feed3429847ed226aebda33a240cc647" - integrity sha512-jM2QlgThIDIc4rcyughD5O7sOYezxdafg/2Xtd1csfK3z6fba3asxDwthqPZAgitrLgiKBDp6XfzC07Y/CefUw== +"@jimp/plugin-scale@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz#36b1b7d70819591901339926a91dae4864cc1b92" + integrity sha512-05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-shadow@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz#a7af892a740febf41211e10a5467c3c5c521a04c" - integrity sha512-MeD2Is17oKzXLnsphAa1sDstTu6nxscugxAEk3ji0GV1FohCvpHBcec0nAq6/czg4WzqfDts+fcPfC79qWmqrA== +"@jimp/plugin-shadow@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.13.tgz#f5b58122c0a6e1307efcddfc165ce1291415d553" + integrity sha512-nmu5VSZ9hsB1JchTKhnnCY+paRBnwzSyK5fhkhtQHHoFD5ArBQ/5wU8y6tCr7k/GQhhGq1OrixsECeMjPoc8Zw== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugin-threshold@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz#34f3078f9965145b7ae26c53a32ad74b1195bbf5" - integrity sha512-iGW8U/wiCSR0+6syrPioVGoSzQFt4Z91SsCRbgNKTAk7D+XQv6OI78jvvYg4o0c2FOlwGhqz147HZV5utoSLxA== +"@jimp/plugin-threshold@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.13.tgz#8de7500b03342b251201bc0feb84955dd3e410f0" + integrity sha512-+3zArBH0OE3Rhjm4HyAokMsZlIq5gpQec33CncyoSwxtRBM2WAhUVmCUKuBo+Lr/2/4ISoY4BWpHKhMLDix6cA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" -"@jimp/plugins@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.1.tgz#9f08544c97226d6460a16ced79f57e85bec3257b" - integrity sha512-c+lCqa25b+4q6mJZSetlxhMoYuiltyS+ValLzdwK/47+aYsq+kcJNl+TuxIEKf59yr9+5rkbpsPkZHLF/V7FFA== +"@jimp/plugins@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.13.tgz#cf441ee13204dd9474bc0e67e41c50afc910de4f" + integrity sha512-CJLdqODEhEVs4MgWCxpWL5l95sCBlkuSLz65cxEm56X5akIsn4LOlwnKoSEZioYcZUBvHhCheH67AyPTudfnQQ== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/plugin-blit" "^0.16.1" - "@jimp/plugin-blur" "^0.16.1" - "@jimp/plugin-circle" "^0.16.1" - "@jimp/plugin-color" "^0.16.1" - "@jimp/plugin-contain" "^0.16.1" - "@jimp/plugin-cover" "^0.16.1" - "@jimp/plugin-crop" "^0.16.1" - "@jimp/plugin-displace" "^0.16.1" - "@jimp/plugin-dither" "^0.16.1" - "@jimp/plugin-fisheye" "^0.16.1" - "@jimp/plugin-flip" "^0.16.1" - "@jimp/plugin-gaussian" "^0.16.1" - "@jimp/plugin-invert" "^0.16.1" - "@jimp/plugin-mask" "^0.16.1" - "@jimp/plugin-normalize" "^0.16.1" - "@jimp/plugin-print" "^0.16.1" - "@jimp/plugin-resize" "^0.16.1" - "@jimp/plugin-rotate" "^0.16.1" - "@jimp/plugin-scale" "^0.16.1" - "@jimp/plugin-shadow" "^0.16.1" - "@jimp/plugin-threshold" "^0.16.1" + "@jimp/plugin-blit" "^0.16.13" + "@jimp/plugin-blur" "^0.16.13" + "@jimp/plugin-circle" "^0.16.13" + "@jimp/plugin-color" "^0.16.13" + "@jimp/plugin-contain" "^0.16.13" + "@jimp/plugin-cover" "^0.16.13" + "@jimp/plugin-crop" "^0.16.13" + "@jimp/plugin-displace" "^0.16.13" + "@jimp/plugin-dither" "^0.16.13" + "@jimp/plugin-fisheye" "^0.16.13" + "@jimp/plugin-flip" "^0.16.13" + "@jimp/plugin-gaussian" "^0.16.13" + "@jimp/plugin-invert" "^0.16.13" + "@jimp/plugin-mask" "^0.16.13" + "@jimp/plugin-normalize" "^0.16.13" + "@jimp/plugin-print" "^0.16.13" + "@jimp/plugin-resize" "^0.16.13" + "@jimp/plugin-rotate" "^0.16.13" + "@jimp/plugin-scale" "^0.16.13" + "@jimp/plugin-shadow" "^0.16.13" + "@jimp/plugin-threshold" "^0.16.13" timm "^1.6.1" -"@jimp/png@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.1.tgz#f24cfc31529900b13a2dd9d4fdb4460c1e4d814e" - integrity sha512-iyWoCxEBTW0OUWWn6SveD4LePW89kO7ZOy5sCfYeDM/oTPLpR8iMIGvZpZUz1b8kvzFr27vPst4E5rJhGjwsdw== +"@jimp/png@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.13.tgz#8b130cc5e1e754c074c42fa3fe2609897cefdf7c" + integrity sha512-8cGqINvbWJf1G0Her9zbq9I80roEX0A+U45xFby3tDWfzn+Zz8XKDF1Nv9VUwVx0N3zpcG1RPs9hfheG4Cq2kg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.16.1" + "@jimp/utils" "^0.16.13" pngjs "^3.3.3" -"@jimp/tiff@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.1.tgz#0e8756695687d7574b6bc73efab0acd4260b7a12" - integrity sha512-3K3+xpJS79RmSkAvFMgqY5dhSB+/sxhwTFA9f4AVHUK0oKW+u6r52Z1L0tMXHnpbAdR9EJ+xaAl2D4x19XShkQ== +"@jimp/tiff@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.13.tgz#9cf8d19f2b0b0c46758e81acfc7d656835ee6da1" + integrity sha512-oJY8d9u95SwW00VPHuCNxPap6Q1+E/xM5QThb9Hu+P6EGuu6lIeLaNBMmFZyblwFbwrH+WBOZlvIzDhi4Dm/6Q== dependencies: "@babel/runtime" "^7.7.2" utif "^2.0.1" -"@jimp/types@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.1.tgz#0dbab37b3202315c91010f16c31766d35a2322cc" - integrity sha512-g1w/+NfWqiVW4CaXSJyD28JQqZtm2eyKMWPhBBDCJN9nLCN12/Az0WFF3JUAktzdsEC2KRN2AqB1a2oMZBNgSQ== +"@jimp/types@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.13.tgz#39be1886cbfa4fb5e77e17441a046a1f961d3046" + integrity sha512-mC0yVNUobFDjoYLg4hoUwzMKgNlxynzwt3cDXzumGvRJ7Kb8qQGOWJQjQFo5OxmGExqzPphkirdbBF88RVLBCg== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/bmp" "^0.16.1" - "@jimp/gif" "^0.16.1" - "@jimp/jpeg" "^0.16.1" - "@jimp/png" "^0.16.1" - "@jimp/tiff" "^0.16.1" + "@jimp/bmp" "^0.16.13" + "@jimp/gif" "^0.16.13" + "@jimp/jpeg" "^0.16.13" + "@jimp/png" "^0.16.13" + "@jimp/tiff" "^0.16.13" timm "^1.6.1" -"@jimp/utils@^0.16.1": - version "0.16.1" - resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.1.tgz#2f51e6f14ff8307c4aa83d5e1a277da14a9fe3f7" - integrity sha512-8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw== +"@jimp/utils@^0.16.13": + version "0.16.13" + resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.13.tgz#afde41b9c6cdadfb45d83cb5e16deb65f369bf99" + integrity sha512-VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA== dependencies: "@babel/runtime" "^7.7.2" regenerator-runtime "^0.13.3" @@ -520,6 +488,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.9": version "0.3.15" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774" @@ -602,6 +578,11 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== +"@tokenizer/token@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" + integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== + "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" @@ -650,18 +631,18 @@ "@types/trusted-types" "*" "@types/express-serve-static-core@^4.17.18": - version "4.17.30" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04" - integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ== + version "4.17.31" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" + integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.11.1": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== +"@types/express@*", "@types/express@^4.17.14": + version "4.17.14" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" + integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -699,26 +680,16 @@ dependencies: "@types/express" "*" -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "18.7.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.14.tgz#0fe081752a3333392d00586d815485a17c2cf3c9" - integrity sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^18.7.18": + version "18.7.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" + integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== "@types/node@16.9.1": version "16.9.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== -"@types/node@^14.14.41": - version "14.18.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.26.tgz#239e19f8b4ea1a9eb710528061c1d733dc561996" - integrity sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA== - -"@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.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" @@ -769,6 +740,21 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/eslint-plugin@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz#5ccdd5d9004120f28fc6e717fb4b5c9bddcfbc04" + integrity sha512-Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og== + dependencies: + "@typescript-eslint/scope-manager" "5.37.0" + "@typescript-eslint/type-utils" "5.37.0" + "@typescript-eslint/utils" "5.37.0" + debug "^4.3.4" + functional-red-black-tree "^1.0.1" + ignore "^5.2.0" + regexpp "^3.2.0" + semver "^7.3.7" + tsutils "^3.21.0" + "@typescript-eslint/parser@5.16.0": version "5.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.16.0.tgz#e4de1bde4b4dad5b6124d3da227347616ed55508" @@ -779,14 +765,14 @@ "@typescript-eslint/typescript-estree" "5.16.0" debug "^4.3.2" -"@typescript-eslint/parser@5.31.0": - version "5.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.31.0.tgz#7f42d7dcc68a0a6d80a0f3d9a65063aee7bb8d2c" - integrity sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw== +"@typescript-eslint/parser@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.37.0.tgz#c382077973f3a4ede7453fb14cadcad3970cbf3b" + integrity sha512-01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw== dependencies: - "@typescript-eslint/scope-manager" "5.31.0" - "@typescript-eslint/types" "5.31.0" - "@typescript-eslint/typescript-estree" "5.31.0" + "@typescript-eslint/scope-manager" "5.37.0" + "@typescript-eslint/types" "5.37.0" + "@typescript-eslint/typescript-estree" "5.37.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.16.0": @@ -797,13 +783,13 @@ "@typescript-eslint/types" "5.16.0" "@typescript-eslint/visitor-keys" "5.16.0" -"@typescript-eslint/scope-manager@5.31.0": - version "5.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz#f47a794ba84d9b818ab7f8f44fff55a61016c606" - integrity sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg== +"@typescript-eslint/scope-manager@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz#044980e4f1516a774a418dafe701a483a6c9f9ca" + integrity sha512-F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q== dependencies: - "@typescript-eslint/types" "5.31.0" - "@typescript-eslint/visitor-keys" "5.31.0" + "@typescript-eslint/types" "5.37.0" + "@typescript-eslint/visitor-keys" "5.37.0" "@typescript-eslint/type-utils@5.16.0": version "5.16.0" @@ -814,15 +800,25 @@ debug "^4.3.2" tsutils "^3.21.0" +"@typescript-eslint/type-utils@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz#43ed2f567ada49d7e33a6e4b6f9babd060445fe5" + integrity sha512-BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ== + dependencies: + "@typescript-eslint/typescript-estree" "5.37.0" + "@typescript-eslint/utils" "5.37.0" + debug "^4.3.4" + tsutils "^3.21.0" + "@typescript-eslint/types@5.16.0": version "5.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee" integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g== -"@typescript-eslint/types@5.31.0": - version "5.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.31.0.tgz#7aa389122b64b18e473c1672fb3b8310e5f07a9a" - integrity sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g== +"@typescript-eslint/types@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.37.0.tgz#09e4870a5f3af7af3f84e08d792644a87d232261" + integrity sha512-3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA== "@typescript-eslint/typescript-estree@5.16.0": version "5.16.0" @@ -837,13 +833,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@5.31.0": - version "5.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz#eb92970c9d6e3946690d50c346fb9b1d745ee882" - integrity sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw== +"@typescript-eslint/typescript-estree@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz#956dcf5c98363bcb97bdd5463a0a86072ff79355" + integrity sha512-JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA== dependencies: - "@typescript-eslint/types" "5.31.0" - "@typescript-eslint/visitor-keys" "5.31.0" + "@typescript-eslint/types" "5.37.0" + "@typescript-eslint/visitor-keys" "5.37.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -862,6 +858,18 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" +"@typescript-eslint/utils@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.37.0.tgz#7784cb8e91390c4f90ccaffd24a0cf9874df81b2" + integrity sha512-jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.37.0" + "@typescript-eslint/types" "5.37.0" + "@typescript-eslint/typescript-estree" "5.37.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + "@typescript-eslint/visitor-keys@5.16.0": version "5.16.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb" @@ -870,15 +878,15 @@ "@typescript-eslint/types" "5.16.0" eslint-visitor-keys "^3.0.0" -"@typescript-eslint/visitor-keys@5.31.0": - version "5.31.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz#b0eca264df01ce85dceb76aebff3784629258f54" - integrity sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg== +"@typescript-eslint/visitor-keys@5.37.0": + version "5.37.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz#7b72dd343295ea11e89b624995abc7103c554eee" + integrity sha512-Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA== dependencies: - "@typescript-eslint/types" "5.31.0" + "@typescript-eslint/types" "5.37.0" eslint-visitor-keys "^3.3.0" -abab@^2.0.5, abab@^2.0.6: +abab@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== @@ -919,7 +927,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: +acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== @@ -956,11 +964,6 @@ ansi-escapes@^4.3.0: dependencies: type-fest "^0.21.3" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -971,13 +974,6 @@ ansi-regex@^6.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -986,9 +982,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" ansi-styles@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3" - integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ== + version "6.1.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.1.tgz#63cd61c72283a71cb30bd881dbb60adada74bc70" + integrity sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg== any-base@^1.1.0: version "1.1.0" @@ -1008,19 +1004,6 @@ append-field@^1.0.0: resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56" integrity sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw== -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.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -1082,12 +1065,13 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928" - integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og== +axios@0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== dependencies: - follow-redirects "^1.14.8" + follow-redirects "^1.14.9" + form-data "^4.0.0" balanced-match@^1.0.0: version "1.0.2" @@ -1216,15 +1200,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^4.0.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -1253,11 +1228,6 @@ chownr@^1.1.1: 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" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -1295,12 +1265,7 @@ cliui@^7.0.2: 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" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== - -color-convert@^1.9.0, color-convert@^1.9.3: +color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -1370,11 +1335,6 @@ comment-parser@1.3.1: resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b" integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA== -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" @@ -1390,11 +1350,6 @@ concat-stream@^1.5.2: 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 sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - content-disposition@0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" @@ -1422,17 +1377,6 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@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" - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -1478,7 +1422,7 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -data-urls@^3.0.1: +data-urls@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== @@ -1506,12 +1450,12 @@ decimal.js@^10.3.1: resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.0.tgz#97a7448873b01e92e5ff9117d89a7bca8e63e0fe" integrity sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg== -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== +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== dependencies: - mimic-response "^2.0.0" + mimic-response "^3.1.0" deep-extend@^0.6.0: version "0.6.0" @@ -1536,11 +1480,6 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - depd@2.0.0, depd@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" @@ -1551,15 +1490,15 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== +detect-libc@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== -devtools-protocol@0.0.981744: - version "0.0.981744" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz#9960da0370284577d46c28979a0b32651022bacf" - integrity sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg== +devtools-protocol@0.0.1036444: + version "0.0.1036444" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz#a570d3cdde61527c82f9b03919847b8ac7b1c2b9" + integrity sha512-0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw== diff@^4.0.1: version "4.0.2" @@ -1599,7 +1538,7 @@ domexception@^4.0.0: dependencies: webidl-conversions "^7.0.0" -dompurify@^2.3.8: +dompurify@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.0.tgz#c9c88390f024c2823332615c9e20a453cf3825dd" integrity sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA== @@ -1646,28 +1585,21 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -entities@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz#c34062a94c865c322f9d67b4384e4169bcede6a4" - integrity sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" +entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: - version "1.20.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" - integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== + version "1.20.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3" + integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" function.prototype.name "^1.1.5" - get-intrinsic "^1.1.1" + get-intrinsic "^1.1.2" get-symbol-description "^1.0.0" has "^1.0.3" has-property-descriptors "^1.0.0" @@ -1679,9 +1611,9 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19 is-shared-array-buffer "^1.0.2" is-string "^1.0.7" is-weakref "^1.0.2" - object-inspect "^1.12.0" + object-inspect "^1.12.2" object-keys "^1.1.1" - object.assign "^4.1.2" + object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" string.prototype.trimend "^1.0.5" string.prototype.trimstart "^1.0.5" @@ -1713,11 +1645,6 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -1754,10 +1681,10 @@ eslint-plugin-jsdoc@38.0.6: semver "^7.3.5" spdx-expression-parse "^3.0.1" -eslint-plugin-jsdoc@39.3.3: - version "39.3.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.3.tgz#75dd67ce581e7527a69f27800138cc0f9c388236" - integrity sha512-K/DAjKRUNaUTf0KQhI9PvsF+Y3mGDx/j0pofXsJCQe/tmRsRweBIXR353c8nAro0lytZYEf7l0PluBpzKDiHxw== +eslint-plugin-jsdoc@39.3.6: + version "39.3.6" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz#6ba29f32368d72a51335a3dc9ccd22ad0437665d" + integrity sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g== dependencies: "@es-joy/jsdoccomment" "~0.31.0" comment-parser "1.3.1" @@ -1804,10 +1731,10 @@ eslint-plugin-react@7.29.4: semver "^6.3.0" string.prototype.matchall "^4.0.6" -eslint-plugin-react@7.31.0: - version "7.31.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.0.tgz#fd3f81c9db5971095b3521ede22781afd37442b0" - integrity sha512-BWriBttYYCnfb4RO9SB91Og8uA9CPcBMl5UlCOCtuYW1UjhN3QypzEcEHky4ZIRZDKjbO2Blh9BjP8E7W/b1SA== +eslint-plugin-react@7.31.8: + version "7.31.8" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf" + integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw== dependencies: array-includes "^3.1.5" array.prototype.flatmap "^1.3.0" @@ -1898,14 +1825,15 @@ eslint@8.11.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -eslint@8.22.0: - version "8.22.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48" - integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA== +eslint@8.23.1: + version "8.23.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc" + integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg== dependencies: - "@eslint/eslintrc" "^1.3.0" + "@eslint/eslintrc" "^1.3.2" "@humanwhocodes/config-array" "^0.10.4" "@humanwhocodes/gitignore-to-minimatch" "^1.0.2" + "@humanwhocodes/module-importer" "^1.0.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -1915,13 +1843,12 @@ eslint@8.22.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.3" + espree "^9.4.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" find-up "^5.0.0" - functional-red-black-tree "^1.0.1" glob-parent "^6.0.1" globals "^13.15.0" globby "^11.1.0" @@ -1930,6 +1857,7 @@ eslint@8.22.0: import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" + js-sdsl "^4.1.4" js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" @@ -1941,9 +1869,8 @@ eslint@8.22.0: strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^9.3.1, espree@^9.3.3, espree@^9.4.0: +espree@^9.3.1, espree@^9.4.0: version "9.4.0" resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== @@ -2029,10 +1956,10 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== -express-prom-bundle@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" - integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== +express-prom-bundle@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-6.5.0.tgz#cdf28b29907618cae933ed14d5b727f7404e810b" + integrity sha512-paFAm0FK7TV1Ln6Blh9edDt2mJ4Pk6Py/fjhZDMcoMHENYryBjCpnXDXuCu8NE1kkvp58IrPcAAkNeNqdvZnnw== dependencies: on-finished "^2.3.0" url-value-parser "^2.0.0" @@ -2096,9 +2023,9 @@ fast-diff@^1.1.2: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2142,10 +2069,14 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -file-type@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18" - integrity sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw== +file-type@^16.5.4: + version "16.5.4" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd" + integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw== + dependencies: + readable-web-to-node-stream "^3.0.0" + strtok3 "^6.2.4" + token-types "^4.1.1" fill-range@^7.0.1: version "7.0.1" @@ -2167,14 +2098,6 @@ finalhandler@1.2.0: statuses "2.0.1" 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== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -2183,13 +2106,6 @@ find-up@^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" @@ -2208,10 +2124,10 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.14.8: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.14.9: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" @@ -2295,29 +2211,15 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== - 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-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -2409,10 +2311,10 @@ globby@^11.0.4, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -google-protobuf@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" - integrity sha512-HADYtu6sDcyk+d74doTotmKcv7QPrGYKv0D3AL8aYwinQ1Ze+3NYhkCSdIor06+Qf3WgauajKhM9yuPb80fW/Q== +google-protobuf@3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.21.0.tgz#8dfa3fca16218618d373d414d3c1139e28034d6e" + integrity sha512-byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g== graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" @@ -2429,11 +2331,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -2458,11 +2355,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -2497,7 +2389,7 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: +https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -2510,21 +2402,10 @@ human-signals@^3.0.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ== -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 "^4.0.0" - ci-info "^2.0.0" - compare-versions "^3.6.0" - cosmiconfig "^7.0.0" - find-versions "^4.0.0" - opencollective-postinstall "^2.0.2" - pkg-dir "^5.0.0" - please-upgrade-node "^3.2.0" - slash "^3.0.0" - which-pm-runs "^1.0.0" +husky@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9" + integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw== iconv-lite@0.4.24: version "0.4.24" @@ -2540,7 +2421,7 @@ iconv-lite@0.6.3: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -ieee754@^1.1.13: +ieee754@^1.1.13, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -2615,11 +2496,6 @@ ipaddr.js@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" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - is-arrayish@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" @@ -2648,9 +2524,9 @@ is-boolean-object@^1.1.0: has-tostringtag "^1.0.0" is-callable@^1.1.4, is-callable@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + version "1.2.6" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz#fd6170b0b8c7e2cc73de342ef8284a2202023c44" + integrity sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q== is-core-module@2.9.0: version "2.9.0" @@ -2678,13 +2554,6 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2785,23 +2654,28 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jimp@0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz#192f851a30e5ca11112a3d0aa53137659a78ca7a" - integrity sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw== +jimp@^0.16.13: + version "0.16.13" + resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.13.tgz#944b6368183235afc5d077429e2a7f34834acb18" + integrity sha512-Bxz8q7V4rnCky9A0ktTNGA9SkNFVWRHodddI/DaAWZJzF7sVUlFYKQ60y9JGqrKpi48ECA/TnfMzzc5C70VByA== dependencies: "@babel/runtime" "^7.7.2" - "@jimp/custom" "^0.16.1" - "@jimp/plugins" "^0.16.1" - "@jimp/types" "^0.16.1" + "@jimp/custom" "^0.16.13" + "@jimp/plugins" "^0.16.13" + "@jimp/types" "^0.16.13" regenerator-runtime "^0.13.3" -jpeg-js@0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz#8b345b1ae4abde64c2da2fe67ea216a114ac279d" - integrity sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw== +jpeg-js@^0.4.2, jpeg-js@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" + integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +js-sdsl@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6" + integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw== + +"js-tokens@^3.0.0 || ^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -2823,28 +2697,28 @@ jsdoc-type-pratt-parser@~3.1.0: resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz#a4a56bdc6e82e5865ffd9febc5b1a227ff28e67e" integrity sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw== -jsdom@19.0.0: - version "19.0.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a" - integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A== +jsdom@20.0.0: + version "20.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz#882825ac9cc5e5bbee704ba16143e1fa78361ebf" + integrity sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA== dependencies: - abab "^2.0.5" - acorn "^8.5.0" + abab "^2.0.6" + acorn "^8.7.1" acorn-globals "^6.0.0" cssom "^0.5.0" cssstyle "^2.3.0" - data-urls "^3.0.1" + data-urls "^3.0.2" decimal.js "^10.3.1" domexception "^4.0.0" escodegen "^2.0.0" form-data "^4.0.0" html-encoding-sniffer "^3.0.0" http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" - parse5 "6.0.1" - saxes "^5.0.1" + parse5 "^7.0.0" + saxes "^6.0.0" symbol-tree "^3.2.4" tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" @@ -2852,8 +2726,8 @@ jsdom@19.0.0: webidl-conversions "^7.0.0" whatwg-encoding "^2.0.0" whatwg-mimetype "^3.0.0" - whatwg-url "^10.0.0" - ws "^8.2.3" + whatwg-url "^11.0.0" + ws "^8.8.0" xml-name-validator "^4.0.0" jsesc@^2.5.1: @@ -2861,11 +2735,6 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -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" @@ -2919,11 +2788,6 @@ lilconfig@2.0.5: resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25" integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg== -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - lint-staged@13.0.3: version "13.0.3" resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.0.3.tgz#d7cdf03a3830b327a2b63c6aec953d71d9dc48c6" @@ -2971,13 +2835,6 @@ load-bmfont@^1.3.1, load-bmfont@^1.4.0: xhr "^2.0.1" xtend "^4.0.0" -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== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -3115,10 +2972,10 @@ mimic-fn@^4.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== -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== +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== min-document@^2.19.0: version "2.19.0" @@ -3213,12 +3070,12 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -node-abi@^2.21.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== +node-abi@^3.3.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.35.0.tgz#c7f171af995cc5286fa95612c4ca97b3910eaa79" + integrity sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw== dependencies: - semver "^5.4.1" + semver "^7.3.5" node-cleanup@^2.1.2: version "2.1.2" @@ -3244,32 +3101,17 @@ npm-run-path@^5.1.0: dependencies: path-key "^4.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 sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - nwsapi@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" - integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== -object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.9.0: +object-inspect@^1.12.2, object-inspect@^1.9.0: version "1.12.2" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== @@ -3279,7 +3121,7 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.2, object.assign@^4.1.3: +object.assign@^4.1.3, object.assign@^4.1.4: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== @@ -3376,11 +3218,6 @@ onetime@^6.0.0: dependencies: mimic-fn "^4.0.0" -opencollective-postinstall@^2.0.2: - 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" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -3410,13 +3247,6 @@ 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.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -3424,13 +3254,6 @@ p-limit@^3.0.2: dependencies: 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== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -3445,11 +3268,6 @@ p-map@^4.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== - pako@^1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -3485,27 +3303,12 @@ parse-headers@^2.0.0: resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== -parse-json@^5.0.0: - 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-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parse5@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a" - integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g== + version "7.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" + integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== dependencies: - entities "^4.3.0" + entities "^4.4.0" parseurl@~1.3.3: version "1.3.3" @@ -3554,6 +3357,11 @@ pause-stream@0.0.11: dependencies: through "~2.3" +peek-readable@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72" + integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg== + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -3581,20 +3389,6 @@ pixelmatch@^4.0.2: dependencies: pngjs "^3.0.0" -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== - dependencies: - find-up "^4.0.0" - -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 "^5.0.0" - pkg-fetch@3.4.2: version "3.4.2" resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.4.2.tgz#6f68ebc54842b73f8c0808959a9df3739dcb28b7" @@ -3609,14 +3403,14 @@ pkg-fetch@3.4.2: tar-fs "^2.1.1" yargs "^16.2.0" -pkg@5.8.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.8.0.tgz#a77644aeff0b94a1656d7f76558837f7c754a4c0" - integrity sha512-8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ== +pkg@5.8.1: + version "5.8.1" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.8.1.tgz#862020f3c0575638ef7d1146f951a54d65ddc984" + integrity sha512-CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA== dependencies: "@babel/generator" "7.18.2" "@babel/parser" "7.18.4" - "@babel/types" "7.18.4" + "@babel/types" "7.19.0" chalk "^4.1.2" fs-extra "^9.1.0" globby "^11.1.0" @@ -3625,17 +3419,10 @@ pkg@5.8.0: minimist "^1.2.6" multistream "^4.1.0" pkg-fetch "3.4.2" - prebuild-install "6.1.4" + prebuild-install "7.1.1" resolve "^1.22.0" stream-meter "^1.0.4" -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - pngjs@^3.0.0, pngjs@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -3648,22 +3435,21 @@ poolpeteer@^0.23.0: dependencies: debug "^4.1.1" -prebuild-install@6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" - integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== +prebuild-install@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" + integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== dependencies: - detect-libc "^1.0.3" + detect-libc "^2.0.0" 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.21.0" - npmlog "^4.0.1" + node-abi "^3.3.0" pump "^3.0.0" rc "^1.2.7" - simple-get "^3.0.3" + simple-get "^4.0.0" tar-fs "^2.0.0" tunnel-agent "^0.6.0" @@ -3684,10 +3470,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +prettier@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" + integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== process-nextick-args@~2.0.0: version "2.0.1" @@ -3704,10 +3490,10 @@ progress@2.0.3, progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -prom-client@^11.5.3: - version "11.5.3" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" - integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== +prom-client@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-14.1.0.tgz#049609859483d900844924df740722c76ed1fdbb" + integrity sha512-iFWCchQmi4170omLpFXbzz62SQTmPhtBL35v0qGEVRHKcqIeiexaoYeP0vfZTujxEq3tA87iqOdRbC9svS1B9A== dependencies: tdigest "^0.1.1" @@ -3720,29 +3506,10 @@ prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" -protobufjs@^6.8.6: - version "6.11.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74" - integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - protobufjs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.0.tgz#5174b5f96fad4f7dea7dd4abd594042ac360e665" - integrity sha512-rCuxKlh0UQKSMjrpIcTLbR5TtGQ52cgs1a5nUoPBAKOccdPblN67BJtjrbtudUJK6HmBvUdsmymyYOzO7lxZEA== + version "7.1.1" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.1.tgz#0117befb4b0f5a49d028e93f2ca62c3c1f5e7c65" + integrity sha512-d0nMQqS/aT3lfV8bKi9Gbg73vPd2LcDdTDOu6RE/M+h9DY8g1EmDzk3ADPccthEWfTBjkR2oxNdx9Gs8YubT+g== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -3802,23 +3569,22 @@ puppeteer-cluster@^0.23.0: dependencies: debug "^4.3.3" -puppeteer@^13.1.3: - version "13.7.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.7.0.tgz#18e16f83e397cf02f7a0804c67c1603d381cfb0b" - integrity sha512-U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA== +puppeteer@^17.1.3: + version "17.1.3" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.3.tgz#2814cf221925e19c681c69aa97401a68b30240c9" + integrity sha512-tVtvNSOOqlq75rUgwLeDAEQoLIiBqmRg0/zedpI6fuqIocIkuxG23A7FIl1oVSkuSMMLgcOP5kVhNETmsmjvPw== dependencies: cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.981744" + devtools-protocol "0.0.1036444" extract-zip "2.0.1" https-proxy-agent "5.0.1" - pkg-dir "4.2.0" progress "2.0.3" proxy-from-env "1.1.0" rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.5.0" + ws "8.8.1" qs@6.10.3: version "6.10.3" @@ -3867,7 +3633,7 @@ react-is@^16.13.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2: +readable-stream@^2.0.0, readable-stream@^2.1.4, readable-stream@^2.2.2: 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== @@ -3889,6 +3655,13 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-web-to-node-stream@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" + integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== + dependencies: + readable-stream "^3.6.0" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -4017,28 +3790,13 @@ sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" - integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== dependencies: xmlchars "^2.2.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -semver-regex@^3.1.2: - version "3.1.4" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz#13053c0d4aa11d070a2f2872b6b1e3ae1e1971b4" - integrity sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA== - -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.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -4080,11 +3838,6 @@ serve-static@1.15.0: parseurl "~1.3.3" send "0.18.0" -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -4111,7 +3864,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7: +signal-exit@^3.0.2, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -4121,12 +3874,12 @@ simple-concat@^1.0.0: 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.1" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" - integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== dependencies: - decompress-response "^4.2.0" + decompress-response "^6.0.0" once "^1.3.1" simple-concat "^1.0.0" @@ -4237,16 +3990,7 @@ string-argv@^0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0: +string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -4310,13 +4054,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -4346,12 +4083,13 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== +strtok3@^6.2.4: + version "6.3.0" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.3.0.tgz#358b80ffe6d5d5620e19a073aa78ce947a90f9a0" + integrity sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw== dependencies: - has-flag "^3.0.0" + "@tokenizer/token" "^0.3.0" + peek-readable "^4.1.0" supports-color@^7.1.0: version "7.2.0" @@ -4440,6 +4178,14 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +token-types@^4.1.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.2.1.tgz#0f897f03665846982806e138977dbe72d44df753" + integrity sha512-6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ== + dependencies: + "@tokenizer/token" "^0.3.0" + ieee754 "^1.2.1" + tough-cookie@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" @@ -4467,12 +4213,12 @@ triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -ts-node@10.5.0: - version "10.5.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.5.0.tgz#618bef5854c1fbbedf5e31465cbb224a1d524ef9" - integrity sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw== +ts-node@10.9.1: + version "10.9.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" + integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== dependencies: - "@cspotcode/source-map-support" "0.7.0" + "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" "@tsconfig/node12" "^1.0.7" "@tsconfig/node14" "^1.0.0" @@ -4483,7 +4229,7 @@ ts-node@10.5.0: create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - v8-compile-cache-lib "^3.0.0" + v8-compile-cache-lib "^3.0.1" yn "3.1.1" tsc-watch@5.0.3: @@ -4563,10 +4309,10 @@ typescript@4.6.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== -typescript@4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== +typescript@4.8.3: + version "4.8.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88" + integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig== unbox-primitive@^1.0.2: version "1.0.2" @@ -4586,17 +4332,17 @@ unbzip2-stream@1.4.3: buffer "^5.2.1" through "^2.3.8" -unique-filename@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== +unique-filename@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== dependencies: - unique-slug "^2.0.0" + unique-slug "^3.0.0" -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== dependencies: imurmurhash "^0.1.4" @@ -4631,9 +4377,9 @@ url-parse@^1.5.3: requires-port "^1.0.0" url-value-parser@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz#fe1ae776122b2eea4bbf284896bbdcd7fc75e1fa" - integrity sha512-gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw== + version "2.2.0" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.2.0.tgz#f38ae8cd24604ec69bc219d66929ddbbd93a2b32" + integrity sha512-yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A== utif@^2.0.1: version "2.0.1" @@ -4652,7 +4398,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -v8-compile-cache-lib@^3.0.0: +v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== @@ -4703,14 +4449,6 @@ whatwg-mimetype@^3.0.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== -whatwg-url@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da" - integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - whatwg-url@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" @@ -4738,11 +4476,6 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-pm-runs@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz#35ccf7b1a0fce87bd8b92a478c9d045785d3bf35" - integrity sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA== - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -4750,13 +4483,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - winston-transport@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa" @@ -4766,11 +4492,12 @@ winston-transport@^4.5.0: readable-stream "^3.6.0" triple-beam "^1.3.0" -winston@^3.2.1: - version "3.8.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.1.tgz#76f15b3478cde170b780234e0c4cf805c5a7fb57" - integrity sha512-r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w== +winston@^3.8.2: + version "3.8.2" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50" + integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew== dependencies: + "@colors/colors" "1.5.0" "@dabh/diagnostics" "^2.0.2" async "^3.2.3" is-stream "^2.0.0" @@ -4810,12 +4537,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== - -ws@^8.2.3: +ws@8.8.1, ws@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== @@ -4873,11 +4595,6 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -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== - yaml@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.1.tgz#1e06fb4ca46e60d9da07e4f786ea370ed3c3cfec" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index adf7ea01b077..2c78883da2dd 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -1,14 +1,6 @@ { fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ - { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - } { name = "_babel_generator___generator_7.18.2.tgz"; path = fetchurl { @@ -26,19 +18,11 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.18.6.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; - sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; - }; - } - { - name = "_babel_highlight___highlight_7.18.6.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; } { @@ -50,27 +34,19 @@ }; } { - name = "_babel_runtime___runtime_7.18.9.tgz"; + name = "_babel_runtime___runtime_7.19.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz"; - sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; + name = "_babel_runtime___runtime_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz"; + sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; }; } { - name = "_babel_types___types_7.18.4.tgz"; + name = "_babel_types___types_7.19.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.18.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz"; - sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; - }; - } - { - name = "_babel_types___types_7.18.13.tgz"; - path = fetchurl { - name = "_babel_types___types_7.18.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz"; - sha512 = "ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ=="; + name = "_babel_types___types_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.19.0.tgz"; + sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; } { @@ -82,19 +58,11 @@ }; } { - name = "_cspotcode_source_map_consumer___source_map_consumer_0.8.0.tgz"; + name = "_cspotcode_source_map_support___source_map_support_0.8.1.tgz"; path = fetchurl { - name = "_cspotcode_source_map_consumer___source_map_consumer_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz"; - sha512 = "41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg=="; - }; - } - { - name = "_cspotcode_source_map_support___source_map_support_0.7.0.tgz"; - path = fetchurl { - name = "_cspotcode_source_map_support___source_map_support_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz"; - sha512 = "X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA=="; + name = "_cspotcode_source_map_support___source_map_support_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; + sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; } { @@ -122,11 +90,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_1.3.1.tgz"; + name = "_eslint_eslintrc___eslintrc_1.3.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz"; - sha512 = "OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ=="; + name = "_eslint_eslintrc___eslintrc_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; + sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; }; } { @@ -138,19 +106,11 @@ }; } { - name = "_grpc_grpc_js___grpc_js_1.6.11.tgz"; + name = "_grpc_grpc_js___grpc_js_1.7.0.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.6.11.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.6.11.tgz"; - sha512 = "e/adiPjUxf5cKYiAlV4m+0jJS4k6g2w78X7WTZB3ISOBzcCwm+cwjB2dSRfBHbu46inGGzQMmWAmsgYLg8yT5g=="; - }; - } - { - name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; - path = fetchurl { - name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; - sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; + name = "_grpc_grpc_js___grpc_js_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.0.tgz"; + sha512 = "wvKxal+40Xx11DXO2q5PfY3UiE25iwTb8SOz6A9IJII/V7d19x2ex0he+GJfVW0JZCaBjCPSjUB0yU9Ecm4WCw=="; }; } { @@ -162,19 +122,19 @@ }; } { - name = "_hapi_boom___boom_9.1.4.tgz"; + name = "_hapi_boom___boom_10.0.0.tgz"; path = fetchurl { - name = "_hapi_boom___boom_9.1.4.tgz"; - url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz"; - sha512 = "Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw=="; + name = "_hapi_boom___boom_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-10.0.0.tgz"; + sha512 = "1YVs9tLHhypBqqinKQRqh7FUERIolarQApO37OWkzD+z6y6USi871Sv746zBPKcIOBuI6g6y4FrwX87mmJ90Gg=="; }; } { - name = "_hapi_hoek___hoek_9.3.0.tgz"; + name = "_hapi_hoek___hoek_10.0.1.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz"; - sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="; + name = "_hapi_hoek___hoek_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-10.0.1.tgz"; + sha512 = "CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw=="; }; } { @@ -201,6 +161,14 @@ sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; }; } + { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; + sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; + }; + } { name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; path = fetchurl { @@ -210,251 +178,251 @@ }; } { - name = "_jimp_bmp___bmp_0.16.1.tgz"; + name = "_jimp_bmp___bmp_0.16.13.tgz"; path = fetchurl { - name = "_jimp_bmp___bmp_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.1.tgz"; - sha512 = "iwyNYQeBawrdg/f24x3pQ5rEx+/GwjZcCXd3Kgc+ZUd+Ivia7sIqBsOnDaMZdKCBPlfW364ekexnlOqyVa0NWg=="; + name = "_jimp_bmp___bmp_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.13.tgz"; + sha512 = "9edAxu7N2FX7vzkdl5Jo1BbACfycUtBQX+XBMcHA2bk62P8R0otgkHg798frgAk/WxQIzwxqOH6wMiCwrlAzdQ=="; }; } { - name = "_jimp_core___core_0.16.1.tgz"; + name = "_jimp_core___core_0.16.13.tgz"; path = fetchurl { - name = "_jimp_core___core_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.1.tgz"; - sha512 = "la7kQia31V6kQ4q1kI/uLimu8FXx7imWVajDGtwUG8fzePLWDFJyZl0fdIXVCL1JW2nBcRHidUot6jvlRDi2+g=="; + name = "_jimp_core___core_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.13.tgz"; + sha512 = "qXpA1tzTnlkTku9yqtuRtS/wVntvE6f3m3GNxdTdtmc+O+Wcg9Xo2ABPMh7Nc0AHbMKzwvwgB2JnjZmlmJEObg=="; }; } { - name = "_jimp_custom___custom_0.16.1.tgz"; + name = "_jimp_custom___custom_0.16.13.tgz"; path = fetchurl { - name = "_jimp_custom___custom_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.1.tgz"; - sha512 = "DNUAHNSiUI/j9hmbatD6WN/EBIyeq4AO0frl5ETtt51VN1SvE4t4v83ZA/V6ikxEf3hxLju4tQ5Pc3zmZkN/3A=="; + name = "_jimp_custom___custom_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.13.tgz"; + sha512 = "LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA=="; }; } { - name = "_jimp_gif___gif_0.16.1.tgz"; + name = "_jimp_gif___gif_0.16.13.tgz"; path = fetchurl { - name = "_jimp_gif___gif_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.1.tgz"; - sha512 = "r/1+GzIW1D5zrP4tNrfW+3y4vqD935WBXSc8X/wm23QTY9aJO9Lw6PEdzpYCEY+SOklIFKaJYUAq/Nvgm/9ryw=="; + name = "_jimp_gif___gif_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.13.tgz"; + sha512 = "yFAMZGv3o+YcjXilMWWwS/bv1iSqykFahFMSO169uVMtfQVfa90kt4/kDwrXNR6Q9i6VHpFiGZMlF2UnHClBvg=="; }; } { - name = "_jimp_jpeg___jpeg_0.16.1.tgz"; + name = "_jimp_jpeg___jpeg_0.16.13.tgz"; path = fetchurl { - name = "_jimp_jpeg___jpeg_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.1.tgz"; - sha512 = "8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w=="; + name = "_jimp_jpeg___jpeg_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.13.tgz"; + sha512 = "BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA=="; }; } { - name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; + name = "_jimp_plugin_blit___plugin_blit_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_blit___plugin_blit_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz"; - sha512 = "fKFNARm32RoLSokJ8WZXHHH2CGzz6ire2n1Jh6u+XQLhk9TweT1DcLHIXwQMh8oR12KgjbgsMGvrMVlVknmOAg=="; + name = "_jimp_plugin_blit___plugin_blit_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz"; + sha512 = "8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g=="; }; } { - name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; + name = "_jimp_plugin_blur___plugin_blur_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_blur___plugin_blur_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz"; - sha512 = "1WhuLGGj9MypFKRcPvmW45ht7nXkOKu+lg3n2VBzIB7r4kKNVchuI59bXaCYQumOLEqVK7JdB4glaDAbCQCLyw=="; + name = "_jimp_plugin_blur___plugin_blur_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz"; + sha512 = "PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg=="; }; } { - name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; + name = "_jimp_plugin_circle___plugin_circle_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_circle___plugin_circle_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz"; - sha512 = "JK7yi1CIU7/XL8hdahjcbGA3V7c+F+Iw+mhMQhLEi7Q0tCnZ69YJBTamMiNg3fWPVfMuvWJJKOBRVpwNTuaZRg=="; + name = "_jimp_plugin_circle___plugin_circle_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.13.tgz"; + sha512 = "RNave7EFgZrb5V5EpdvJGAEHMnDAJuwv05hKscNfIYxf0kR3KhViBTDy+MoTnMlIvaKFULfwIgaZWzyhuINMzA=="; }; } { - name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; + name = "_jimp_plugin_color___plugin_color_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_color___plugin_color_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.1.tgz"; - sha512 = "9yQttBAO5SEFj7S6nJK54f+1BnuBG4c28q+iyzm1JjtnehjqMg6Ljw4gCSDCvoCQ3jBSYHN66pmwTV74SU1B7A=="; + name = "_jimp_plugin_color___plugin_color_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.13.tgz"; + sha512 = "xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ=="; }; } { - name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; + name = "_jimp_plugin_contain___plugin_contain_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_contain___plugin_contain_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz"; - sha512 = "44F3dUIjBDHN+Ym/vEfg+jtjMjAqd2uw9nssN67/n4FdpuZUVs7E7wadKY1RRNuJO+WgcD5aDQcsvurXMETQTg=="; + name = "_jimp_plugin_contain___plugin_contain_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.13.tgz"; + sha512 = "QayTXw4tXMwU6q6acNTQrTTFTXpNRBe+MgTGMDU0lk+23PjlFCO/9sacflelG8lsp7vNHhAxFeHptDMAksEYzg=="; }; } { - name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; + name = "_jimp_plugin_cover___plugin_cover_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_cover___plugin_cover_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz"; - sha512 = "YztWCIldBAVo0zxcQXR+a/uk3/TtYnpKU2CanOPJ7baIuDlWPsG+YE4xTsswZZc12H9Kl7CiziEbDtvF9kwA/Q=="; + name = "_jimp_plugin_cover___plugin_cover_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.13.tgz"; + sha512 = "BSsP71GTNaqWRcvkbWuIVH+zK7b3TSNebbhDkFK0fVaUTzHuKMS/mgY4hDZIEVt7Rf5FjadAYtsujHN9w0iSYA=="; }; } { - name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; + name = "_jimp_plugin_crop___plugin_crop_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_crop___plugin_crop_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz"; - sha512 = "UQdva9oQzCVadkyo3T5Tv2CUZbf0klm2cD4cWMlASuTOYgaGaFHhT9st+kmfvXjKL8q3STkBu/zUPV6PbuV3ew=="; + name = "_jimp_plugin_crop___plugin_crop_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz"; + sha512 = "WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA=="; }; } { - name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; + name = "_jimp_plugin_displace___plugin_displace_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_displace___plugin_displace_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz"; - sha512 = "iVAWuz2+G6Heu8gVZksUz+4hQYpR4R0R/RtBzpWEl8ItBe7O6QjORAkhxzg+WdYLL2A/Yd4ekTpvK0/qW8hTVw=="; + name = "_jimp_plugin_displace___plugin_displace_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.13.tgz"; + sha512 = "qt9WKq8vWrcjySa9DyQ0x/RBMHQeiVjdVSY1SJsMjssPUf0pS74qorcuAkGi89biN3YoGUgPkpqECnAWnYwgGA=="; }; } { - name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; + name = "_jimp_plugin_dither___plugin_dither_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_dither___plugin_dither_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz"; - sha512 = "tADKVd+HDC9EhJRUDwMvzBXPz4GLoU6s5P7xkVq46tskExYSptgj5713J5Thj3NMgH9Rsqu22jNg1H/7tr3V9Q=="; + name = "_jimp_plugin_dither___plugin_dither_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.13.tgz"; + sha512 = "5/N3yJggbWQTlGZHQYJPmQXEwR52qaXjEzkp1yRBbtdaekXE3BG/suo0fqeoV/csf8ooI78sJzYmIrxNoWVtgQ=="; }; } { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz"; - sha512 = "BWHnc5hVobviTyIRHhIy9VxI1ACf4CeSuCfURB6JZm87YuyvgQh5aX5UDKtOz/3haMHXBLP61ZBxlNpMD8CG4A=="; + name = "_jimp_plugin_fisheye___plugin_fisheye_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.13.tgz"; + sha512 = "2rZmTdFbT/cF9lEZIkXCYO0TsT114Q27AX5IAo0Sju6jVQbvIk1dFUTnwLDadTo8wkJlFzGqMQ24Cs8cHWOliA=="; }; } { - name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; + name = "_jimp_plugin_flip___plugin_flip_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_flip___plugin_flip_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz"; - sha512 = "KdxTf0zErfZ8DyHkImDTnQBuHby+a5YFdoKI/G3GpBl3qxLBvC+PWkS2F/iN3H7wszP7/TKxTEvWL927pypT0w=="; + name = "_jimp_plugin_flip___plugin_flip_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.13.tgz"; + sha512 = "EmcgAA74FTc5u7Z+hUO/sRjWwfPPLuOQP5O64x5g4j0T12Bd29IgsYZxoutZo/rb3579+JNa/3wsSEmyVv1EpA=="; }; } { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz"; - sha512 = "u9n4wjskh3N1mSqketbL6tVcLU2S5TEaFPR40K6TDv4phPLZALi1Of7reUmYpVm8mBDHt1I6kGhuCJiWvzfGyg=="; + name = "_jimp_plugin_gaussian___plugin_gaussian_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.13.tgz"; + sha512 = "A1XKfGQD0iDdIiKqFYi8nZMv4dDVYdxbrmgR7y/CzUHhSYdcmoljLIIsZZM3Iks/Wa353W3vtvkWLuDbQbch1w=="; }; } { - name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; + name = "_jimp_plugin_invert___plugin_invert_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_invert___plugin_invert_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz"; - sha512 = "2DKuyVXANH8WDpW9NG+PYFbehzJfweZszFYyxcaewaPLN0GxvxVLOGOPP1NuUTcHkOdMFbE0nHDuB7f+sYF/2w=="; + name = "_jimp_plugin_invert___plugin_invert_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.13.tgz"; + sha512 = "xFMrIn7czEZbdbMzZWuaZFnlLGJDVJ82y5vlsKsXRTG2kcxRsMPXvZRWHV57nSs1YFsNqXSbrC8B98n0E32njQ=="; }; } { - name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; + name = "_jimp_plugin_mask___plugin_mask_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_mask___plugin_mask_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz"; - sha512 = "snfiqHlVuj4bSFS0v96vo2PpqCDMe4JB+O++sMo5jF5mvGcGL6AIeLo8cYqPNpdO6BZpBJ8MY5El0Veckhr39Q=="; + name = "_jimp_plugin_mask___plugin_mask_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.13.tgz"; + sha512 = "wLRYKVBXql2GAYgt6FkTnCfE+q5NomM7Dlh0oIPGAoMBWDyTx0eYutRK6PlUrRK2yMHuroAJCglICTbxqGzowQ=="; }; } { - name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_normalize___plugin_normalize_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz"; - sha512 = "dOQfIOvGLKDKXPU8xXWzaUeB0nvkosHw6Xg1WhS1Z5Q0PazByhaxOQkSKgUryNN/H+X7UdbDvlyh/yHf3ITRaw=="; + name = "_jimp_plugin_normalize___plugin_normalize_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.13.tgz"; + sha512 = "3tfad0n9soRna4IfW9NzQdQ2Z3ijkmo21DREHbE6CGcMIxOSvfRdSvf1qQPApxjTSo8LTU4MCi/fidx/NZ0GqQ=="; }; } { - name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; + name = "_jimp_plugin_print___plugin_print_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_print___plugin_print_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.1.tgz"; - sha512 = "ceWgYN40jbN4cWRxixym+csyVymvrryuKBQ+zoIvN5iE6OyS+2d7Mn4zlNgumSczb9GGyZZESIgVcBDA1ezq0Q=="; + name = "_jimp_plugin_print___plugin_print_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.13.tgz"; + sha512 = "0m6i3p01PGRkGAK9r53hDYrkyMq+tlhLOIbsSTmZyh6HLshUKlTB7eXskF5OpVd5ZUHoltlNc6R+ggvKIzxRFw=="; }; } { - name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; + name = "_jimp_plugin_resize___plugin_resize_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_resize___plugin_resize_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz"; - sha512 = "u4JBLdRI7dargC04p2Ha24kofQBk3vhaf0q8FwSYgnCRwxfvh2RxvhJZk9H7Q91JZp6wgjz/SjvEAYjGCEgAwQ=="; + name = "_jimp_plugin_resize___plugin_resize_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz"; + sha512 = "qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ=="; }; } { - name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_rotate___plugin_rotate_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz"; - sha512 = "ZUU415gDQ0VjYutmVgAYYxC9Og9ixu2jAGMCU54mSMfuIlmohYfwARQmI7h4QB84M76c9hVLdONWjuo+rip/zg=="; + name = "_jimp_plugin_rotate___plugin_rotate_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz"; + sha512 = "Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw=="; }; } { - name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; + name = "_jimp_plugin_scale___plugin_scale_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_scale___plugin_scale_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz"; - sha512 = "jM2QlgThIDIc4rcyughD5O7sOYezxdafg/2Xtd1csfK3z6fba3asxDwthqPZAgitrLgiKBDp6XfzC07Y/CefUw=="; + name = "_jimp_plugin_scale___plugin_scale_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz"; + sha512 = "05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A=="; }; } { - name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_shadow___plugin_shadow_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz"; - sha512 = "MeD2Is17oKzXLnsphAa1sDstTu6nxscugxAEk3ji0GV1FohCvpHBcec0nAq6/czg4WzqfDts+fcPfC79qWmqrA=="; + name = "_jimp_plugin_shadow___plugin_shadow_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.13.tgz"; + sha512 = "nmu5VSZ9hsB1JchTKhnnCY+paRBnwzSyK5fhkhtQHHoFD5ArBQ/5wU8y6tCr7k/GQhhGq1OrixsECeMjPoc8Zw=="; }; } { - name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugin_threshold___plugin_threshold_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz"; - sha512 = "iGW8U/wiCSR0+6syrPioVGoSzQFt4Z91SsCRbgNKTAk7D+XQv6OI78jvvYg4o0c2FOlwGhqz147HZV5utoSLxA=="; + name = "_jimp_plugin_threshold___plugin_threshold_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.13.tgz"; + sha512 = "+3zArBH0OE3Rhjm4HyAokMsZlIq5gpQec33CncyoSwxtRBM2WAhUVmCUKuBo+Lr/2/4ISoY4BWpHKhMLDix6cA=="; }; } { - name = "_jimp_plugins___plugins_0.16.1.tgz"; + name = "_jimp_plugins___plugins_0.16.13.tgz"; path = fetchurl { - name = "_jimp_plugins___plugins_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.1.tgz"; - sha512 = "c+lCqa25b+4q6mJZSetlxhMoYuiltyS+ValLzdwK/47+aYsq+kcJNl+TuxIEKf59yr9+5rkbpsPkZHLF/V7FFA=="; + name = "_jimp_plugins___plugins_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.13.tgz"; + sha512 = "CJLdqODEhEVs4MgWCxpWL5l95sCBlkuSLz65cxEm56X5akIsn4LOlwnKoSEZioYcZUBvHhCheH67AyPTudfnQQ=="; }; } { - name = "_jimp_png___png_0.16.1.tgz"; + name = "_jimp_png___png_0.16.13.tgz"; path = fetchurl { - name = "_jimp_png___png_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.1.tgz"; - sha512 = "iyWoCxEBTW0OUWWn6SveD4LePW89kO7ZOy5sCfYeDM/oTPLpR8iMIGvZpZUz1b8kvzFr27vPst4E5rJhGjwsdw=="; + name = "_jimp_png___png_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.13.tgz"; + sha512 = "8cGqINvbWJf1G0Her9zbq9I80roEX0A+U45xFby3tDWfzn+Zz8XKDF1Nv9VUwVx0N3zpcG1RPs9hfheG4Cq2kg=="; }; } { - name = "_jimp_tiff___tiff_0.16.1.tgz"; + name = "_jimp_tiff___tiff_0.16.13.tgz"; path = fetchurl { - name = "_jimp_tiff___tiff_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.1.tgz"; - sha512 = "3K3+xpJS79RmSkAvFMgqY5dhSB+/sxhwTFA9f4AVHUK0oKW+u6r52Z1L0tMXHnpbAdR9EJ+xaAl2D4x19XShkQ=="; + name = "_jimp_tiff___tiff_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.13.tgz"; + sha512 = "oJY8d9u95SwW00VPHuCNxPap6Q1+E/xM5QThb9Hu+P6EGuu6lIeLaNBMmFZyblwFbwrH+WBOZlvIzDhi4Dm/6Q=="; }; } { - name = "_jimp_types___types_0.16.1.tgz"; + name = "_jimp_types___types_0.16.13.tgz"; path = fetchurl { - name = "_jimp_types___types_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.1.tgz"; - sha512 = "g1w/+NfWqiVW4CaXSJyD28JQqZtm2eyKMWPhBBDCJN9nLCN12/Az0WFF3JUAktzdsEC2KRN2AqB1a2oMZBNgSQ=="; + name = "_jimp_types___types_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.13.tgz"; + sha512 = "mC0yVNUobFDjoYLg4hoUwzMKgNlxynzwt3cDXzumGvRJ7Kb8qQGOWJQjQFo5OxmGExqzPphkirdbBF88RVLBCg=="; }; } { - name = "_jimp_utils___utils_0.16.1.tgz"; + name = "_jimp_utils___utils_0.16.13.tgz"; path = fetchurl { - name = "_jimp_utils___utils_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.1.tgz"; - sha512 = "8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw=="; + name = "_jimp_utils___utils_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.13.tgz"; + sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA=="; }; } { @@ -489,6 +457,14 @@ sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.9.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.9.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; + sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; + }; + } { name = "_jridgewell_trace_mapping___trace_mapping_0.3.15.tgz"; path = fetchurl { @@ -601,6 +577,14 @@ sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; } + { + name = "_tokenizer_token___token_0.3.0.tgz"; + path = fetchurl { + name = "_tokenizer_token___token_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz"; + sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="; + }; + } { name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { @@ -666,19 +650,19 @@ }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.30.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.31.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.30.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"; - sha512 = "gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ=="; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.31.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; + sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; } { - name = "_types_express___express_4.17.13.tgz"; + name = "_types_express___express_4.17.14.tgz"; path = fetchurl { - name = "_types_express___express_4.17.13.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; - sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; + name = "_types_express___express_4.17.14.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz"; + sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; } { @@ -722,11 +706,11 @@ }; } { - name = "_types_node___node_18.7.14.tgz"; + name = "_types_node___node_18.7.18.tgz"; path = fetchurl { - name = "_types_node___node_18.7.14.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.14.tgz"; - sha512 = "6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA=="; + name = "_types_node___node_18.7.18.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz"; + sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; }; } { @@ -737,22 +721,6 @@ sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; } - { - name = "_types_node___node_14.18.26.tgz"; - path = fetchurl { - name = "_types_node___node_14.18.26.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.26.tgz"; - sha512 = "0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA=="; - }; - } - { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - } { name = "_types_qs___qs_6.9.7.tgz"; path = fetchurl { @@ -809,6 +777,14 @@ sha512 = "SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw=="; }; } + { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.37.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.37.0.tgz"; + sha512 = "Fde6W0IafXktz1UlnhGkrrmnnGpAo1kyX7dnyHHVrmwJOn72Oqm3eYtddrpOwwel2W8PAK9F3pIL5S+lfoM0og=="; + }; + } { name = "_typescript_eslint_parser___parser_5.16.0.tgz"; path = fetchurl { @@ -818,11 +794,11 @@ }; } { - name = "_typescript_eslint_parser___parser_5.31.0.tgz"; + name = "_typescript_eslint_parser___parser_5.37.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_5.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.31.0.tgz"; - sha512 = "UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw=="; + name = "_typescript_eslint_parser___parser_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.37.0.tgz"; + sha512 = "01VzI/ipYKuaG5PkE5+qyJ6m02fVALmMPY3Qq5BHflDx3y4VobbLdHQkSMg9VPRS4KdNt4oYTMaomFoHonBGAw=="; }; } { @@ -834,11 +810,11 @@ }; } { - name = "_typescript_eslint_scope_manager___scope_manager_5.31.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_5.37.0.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"; - sha512 = "8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg=="; + name = "_typescript_eslint_scope_manager___scope_manager_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.37.0.tgz"; + sha512 = "F67MqrmSXGd/eZnujjtkPgBQzgespu/iCZ+54Ok9X5tALb9L2v3G+QBSoWkXG0p3lcTJsL+iXz5eLUEdSiJU9Q=="; }; } { @@ -849,6 +825,14 @@ sha512 = "SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ=="; }; } + { + name = "_typescript_eslint_type_utils___type_utils_5.37.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_type_utils___type_utils_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.37.0.tgz"; + sha512 = "BSx/O0Z0SXOF5tY0bNTBcDEKz2Ec20GVYvq/H/XNKiUorUFilH7NPbFUuiiyzWaSdN3PA8JV0OvYx0gH/5aFAQ=="; + }; + } { name = "_typescript_eslint_types___types_5.16.0.tgz"; path = fetchurl { @@ -858,11 +842,11 @@ }; } { - name = "_typescript_eslint_types___types_5.31.0.tgz"; + name = "_typescript_eslint_types___types_5.37.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_5.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.31.0.tgz"; - sha512 = "/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g=="; + name = "_typescript_eslint_types___types_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.37.0.tgz"; + sha512 = "3frIJiTa5+tCb2iqR/bf7XwU20lnU05r/sgPJnRpwvfZaqCJBrl8Q/mw9vr3NrNdB/XtVyMA0eppRMMBqdJ1bA=="; }; } { @@ -874,11 +858,11 @@ }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.31.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.37.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"; - sha512 = "3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw=="; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.37.0.tgz"; + sha512 = "JkFoFIt/cx59iqEDSgIGnQpCTRv96MQnXCYvJi7QhBC24uyuzbD8wVbajMB1b9x4I0octYFJ3OwjAwNqk1AjDA=="; }; } { @@ -889,6 +873,14 @@ sha512 = "iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ=="; }; } + { + name = "_typescript_eslint_utils___utils_5.37.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_utils___utils_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.37.0.tgz"; + sha512 = "jUEJoQrWbZhmikbcWSMDuUSxEE7ID2W/QCV/uz10WtQqfOuKZUqFGjqLJ+qhDd17rjgp+QJPqTdPIBWwoob2NQ=="; + }; + } { name = "_typescript_eslint_visitor_keys___visitor_keys_5.16.0.tgz"; path = fetchurl { @@ -898,11 +890,11 @@ }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.31.0.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_5.37.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.31.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"; - sha512 = "ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg=="; + name = "_typescript_eslint_visitor_keys___visitor_keys_5.37.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.37.0.tgz"; + sha512 = "Hp7rT4cENBPIzMwrlehLW/28EVCOcE9U1Z1BQTc8EA8v5qpr7GRGuG+U58V5tTY48zvUOA3KHvw3rA8tY9fbdA=="; }; } { @@ -1001,14 +993,6 @@ sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; } - { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -1025,14 +1009,6 @@ sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; }; } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } { name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { @@ -1042,11 +1018,11 @@ }; } { - name = "ansi_styles___ansi_styles_6.1.0.tgz"; + name = "ansi_styles___ansi_styles_6.1.1.tgz"; path = fetchurl { - name = "ansi_styles___ansi_styles_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz"; - sha512 = "VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ=="; + name = "ansi_styles___ansi_styles_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.1.tgz"; + sha512 = "qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg=="; }; } { @@ -1073,22 +1049,6 @@ sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="; }; } - { - name = "aproba___aproba_1.2.0.tgz"; - path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; - }; - } - { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; - }; - } { name = "arg___arg_4.1.3.tgz"; path = fetchurl { @@ -1170,11 +1130,11 @@ }; } { - name = "axios___axios_0.26.0.tgz"; + name = "axios___axios_0.27.2.tgz"; path = fetchurl { - name = "axios___axios_0.26.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz"; - sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; + name = "axios___axios_0.27.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz"; + sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; } { @@ -1329,14 +1289,6 @@ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { @@ -1361,14 +1313,6 @@ sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } - { - name = "ci_info___ci_info_2.0.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } { name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { @@ -1409,14 +1353,6 @@ sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; - }; - } { name = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { @@ -1505,14 +1441,6 @@ sha512 = "B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA=="; }; } - { - 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"; - sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; - }; - } { name = "concat_map___concat_map_0.0.1.tgz"; path = fetchurl { @@ -1529,14 +1457,6 @@ sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - 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"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - } { name = "content_disposition___content_disposition_0.5.4.tgz"; path = fetchurl { @@ -1577,14 +1497,6 @@ sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } - { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - } { name = "create_require___create_require_1.1.1.tgz"; path = fetchurl { @@ -1674,11 +1586,11 @@ }; } { - name = "decompress_response___decompress_response_4.2.1.tgz"; + name = "decompress_response___decompress_response_6.0.0.tgz"; path = fetchurl { - name = "decompress_response___decompress_response_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; - sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -1713,14 +1625,6 @@ sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - } { name = "depd___depd_2.0.0.tgz"; path = fetchurl { @@ -1738,19 +1642,19 @@ }; } { - name = "detect_libc___detect_libc_1.0.3.tgz"; + name = "detect_libc___detect_libc_2.0.1.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="; + name = "detect_libc___detect_libc_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.981744.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.981744.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz"; - sha512 = "0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg=="; + name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz"; + sha512 = "0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw=="; }; } { @@ -1874,27 +1778,19 @@ }; } { - name = "entities___entities_4.3.1.tgz"; + name = "entities___entities_4.4.0.tgz"; path = fetchurl { - name = "entities___entities_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-4.3.1.tgz"; - sha512 = "o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg=="; + name = "entities___entities_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; }; } { - name = "error_ex___error_ex_1.3.2.tgz"; + name = "es_abstract___es_abstract_1.20.2.tgz"; path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - } - { - name = "es_abstract___es_abstract_1.20.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.20.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; + name = "es_abstract___es_abstract_1.20.2.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz"; + sha512 = "XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ=="; }; } { @@ -1929,14 +1825,6 @@ sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - } { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; path = fetchurl { @@ -1970,11 +1858,11 @@ }; } { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_39.3.3.tgz"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_39.3.6.tgz"; path = fetchurl { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_39.3.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.3.tgz"; - sha512 = "K/DAjKRUNaUTf0KQhI9PvsF+Y3mGDx/j0pofXsJCQe/tmRsRweBIXR353c8nAro0lytZYEf7l0PluBpzKDiHxw=="; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_39.3.6.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz"; + sha512 = "R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g=="; }; } { @@ -2010,11 +1898,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.31.0.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.31.8.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.31.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.0.tgz"; - sha512 = "BWriBttYYCnfb4RO9SB91Og8uA9CPcBMl5UlCOCtuYW1UjhN3QypzEcEHky4ZIRZDKjbO2Blh9BjP8E7W/b1SA=="; + name = "eslint_plugin_react___eslint_plugin_react_7.31.8.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz"; + sha512 = "5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw=="; }; } { @@ -2066,11 +1954,11 @@ }; } { - name = "eslint___eslint_8.22.0.tgz"; + name = "eslint___eslint_8.23.1.tgz"; path = fetchurl { - name = "eslint___eslint_8.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz"; - sha512 = "ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA=="; + name = "eslint___eslint_8.23.1.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz"; + sha512 = "w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg=="; }; } { @@ -2170,11 +2058,11 @@ }; } { - name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; + name = "express_prom_bundle___express_prom_bundle_6.5.0.tgz"; path = fetchurl { - name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz"; - sha512 = "tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg=="; + name = "express_prom_bundle___express_prom_bundle_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-6.5.0.tgz"; + sha512 = "paFAm0FK7TV1Ln6Blh9edDt2mJ4Pk6Py/fjhZDMcoMHENYryBjCpnXDXuCu8NE1kkvp58IrPcAAkNeNqdvZnnw=="; }; } { @@ -2210,11 +2098,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.11.tgz"; + name = "fast_glob___fast_glob_3.2.12.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.11.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; - sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; + name = "fast_glob___fast_glob_3.2.12.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz"; + sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; }; } { @@ -2266,11 +2154,11 @@ }; } { - name = "file_type___file_type_9.0.0.tgz"; + name = "file_type___file_type_16.5.4.tgz"; path = fetchurl { - name = "file_type___file_type_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz"; - sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; + name = "file_type___file_type_16.5.4.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz"; + sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; }; } { @@ -2289,14 +2177,6 @@ sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; } - { - name = "find_up___find_up_4.1.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"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - } { name = "find_up___find_up_5.0.0.tgz"; path = fetchurl { @@ -2305,14 +2185,6 @@ sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; } - { - 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"; - sha512 = "wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ=="; - }; - } { name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { @@ -2338,11 +2210,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } { @@ -2449,14 +2321,6 @@ sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; }; } - { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -2466,11 +2330,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; } { @@ -2562,11 +2426,11 @@ }; } { - name = "google_protobuf___google_protobuf_3.5.0.tgz"; + name = "google_protobuf___google_protobuf_3.21.0.tgz"; path = fetchurl { - name = "google_protobuf___google_protobuf_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz"; - sha512 = "HADYtu6sDcyk+d74doTotmKcv7QPrGYKv0D3AL8aYwinQ1Ze+3NYhkCSdIor06+Qf3WgauajKhM9yuPb80fW/Q=="; + name = "google_protobuf___google_protobuf_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.21.0.tgz"; + sha512 = "byR7MBTK4tZ5PZEb+u5ZTzpt4SfrTxv5682MjPlHN16XeqgZE2/8HOIWeiXe8JKnT9OVbtBGhbq8mtvkK8cd5g=="; }; } { @@ -2593,14 +2457,6 @@ sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - } { name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { @@ -2633,14 +2489,6 @@ sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; } - { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -2690,11 +2538,11 @@ }; } { - name = "husky___husky_4.3.8.tgz"; + name = "husky___husky_8.0.1.tgz"; path = fetchurl { - name = "husky___husky_4.3.8.tgz"; - url = "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz"; - sha512 = "LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow=="; + name = "husky___husky_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz"; + sha512 = "xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw=="; }; } { @@ -2809,14 +2657,6 @@ sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - } { name = "is_arrayish___is_arrayish_0.3.2.tgz"; path = fetchurl { @@ -2850,11 +2690,11 @@ }; } { - name = "is_callable___is_callable_1.2.4.tgz"; + name = "is_callable___is_callable_1.2.6.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + name = "is_callable___is_callable_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz"; + sha512 = "krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="; }; } { @@ -2889,14 +2729,6 @@ sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; path = fetchurl { @@ -3034,19 +2866,27 @@ }; } { - name = "jimp___jimp_0.16.1.tgz"; + name = "jimp___jimp_0.16.13.tgz"; path = fetchurl { - name = "jimp___jimp_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz"; - sha512 = "+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw=="; + name = "jimp___jimp_0.16.13.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.16.13.tgz"; + sha512 = "Bxz8q7V4rnCky9A0ktTNGA9SkNFVWRHodddI/DaAWZJzF7sVUlFYKQ60y9JGqrKpi48ECA/TnfMzzc5C70VByA=="; }; } { - name = "jpeg_js___jpeg_js_0.4.2.tgz"; + name = "jpeg_js___jpeg_js_0.4.4.tgz"; path = fetchurl { - name = "jpeg_js___jpeg_js_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.2.tgz"; - sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="; + name = "jpeg_js___jpeg_js_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz"; + sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; + }; + } + { + name = "js_sdsl___js_sdsl_4.1.4.tgz"; + path = fetchurl { + name = "js_sdsl___js_sdsl_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz"; + sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; }; } { @@ -3082,11 +2922,11 @@ }; } { - name = "jsdom___jsdom_19.0.0.tgz"; + name = "jsdom___jsdom_20.0.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_19.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz"; - sha512 = "RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A=="; + name = "jsdom___jsdom_20.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.0.tgz"; + sha512 = "x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA=="; }; } { @@ -3097,14 +2937,6 @@ sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; } - { - 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"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -3169,14 +3001,6 @@ sha512 = "xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="; }; } - { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - } { name = "lint_staged___lint_staged_13.0.3.tgz"; path = fetchurl { @@ -3201,14 +3025,6 @@ sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; }; } - { - name = "locate_path___locate_path_5.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"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - } { name = "locate_path___locate_path_6.0.0.tgz"; path = fetchurl { @@ -3394,11 +3210,11 @@ }; } { - name = "mimic_response___mimic_response_2.1.0.tgz"; + name = "mimic_response___mimic_response_3.1.0.tgz"; path = fetchurl { - name = "mimic_response___mimic_response_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; - sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; } { @@ -3514,11 +3330,11 @@ }; } { - name = "node_abi___node_abi_2.30.1.tgz"; + name = "node_abi___node_abi_3.35.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_2.30.1.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; - sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + name = "node_abi___node_abi_3.35.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.35.0.tgz"; + sha512 = "jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw=="; }; } { @@ -3554,27 +3370,11 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; + name = "nwsapi___nwsapi_2.2.2.tgz"; path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; - }; - } - { - name = "number_is_nan___number_is_nan_1.0.1.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"; - sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; - }; - } - { - name = "nwsapi___nwsapi_2.2.1.tgz"; - path = fetchurl { - name = "nwsapi___nwsapi_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz"; - sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; + name = "nwsapi___nwsapi_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz"; + sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; } { @@ -3705,14 +3505,6 @@ sha512 = "1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ=="; }; } - { - name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; - path = fetchurl { - name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; - sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; - }; - } { name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { @@ -3737,14 +3529,6 @@ sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; }; } - { - name = "p_limit___p_limit_2.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - } { name = "p_limit___p_limit_3.1.0.tgz"; path = fetchurl { @@ -3753,14 +3537,6 @@ sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; } - { - name = "p_locate___p_locate_4.1.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"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - } { name = "p_locate___p_locate_5.0.0.tgz"; path = fetchurl { @@ -3777,14 +3553,6 @@ sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; } - { - 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"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - } { name = "pako___pako_1.0.11.tgz"; path = fetchurl { @@ -3834,27 +3602,11 @@ }; } { - name = "parse_json___parse_json_5.2.0.tgz"; + name = "parse5___parse5_7.1.1.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - } - { - name = "parse5___parse5_6.0.1.tgz"; - path = fetchurl { - name = "parse5___parse5_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - } - { - name = "parse5___parse5_7.0.0.tgz"; - path = fetchurl { - name = "parse5___parse5_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz"; - sha512 = "y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g=="; + name = "parse5___parse5_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz"; + sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; }; } { @@ -3929,6 +3681,14 @@ sha512 = "e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="; }; } + { + name = "peek_readable___peek_readable_4.1.0.tgz"; + path = fetchurl { + name = "peek_readable___peek_readable_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; + }; + } { name = "pend___pend_1.2.0.tgz"; path = fetchurl { @@ -3969,22 +3729,6 @@ sha512 = "J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA=="; }; } - { - name = "pkg_dir___pkg_dir_4.2.0.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"; - sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; - }; - } - { - name = "pkg_dir___pkg_dir_5.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; - sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; - }; - } { name = "pkg_fetch___pkg_fetch_3.4.2.tgz"; path = fetchurl { @@ -3994,19 +3738,11 @@ }; } { - name = "pkg___pkg_5.8.0.tgz"; + name = "pkg___pkg_5.8.1.tgz"; path = fetchurl { - name = "pkg___pkg_5.8.0.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-5.8.0.tgz"; - sha512 = "8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ=="; - }; - } - { - name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; - path = fetchurl { - name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; - sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg=="; + name = "pkg___pkg_5.8.1.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.8.1.tgz"; + sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA=="; }; } { @@ -4026,11 +3762,11 @@ }; } { - name = "prebuild_install___prebuild_install_6.1.4.tgz"; + name = "prebuild_install___prebuild_install_7.1.1.tgz"; path = fetchurl { - name = "prebuild_install___prebuild_install_6.1.4.tgz"; - url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; - sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + name = "prebuild_install___prebuild_install_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz"; + sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; }; } { @@ -4058,11 +3794,11 @@ }; } { - name = "prettier___prettier_2.2.1.tgz"; + name = "prettier___prettier_2.7.1.tgz"; path = fetchurl { - name = "prettier___prettier_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; - sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; + name = "prettier___prettier_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz"; + sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; }; } { @@ -4090,11 +3826,11 @@ }; } { - name = "prom_client___prom_client_11.5.3.tgz"; + name = "prom_client___prom_client_14.1.0.tgz"; path = fetchurl { - name = "prom_client___prom_client_11.5.3.tgz"; - url = "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz"; - sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; + name = "prom_client___prom_client_14.1.0.tgz"; + url = "https://registry.yarnpkg.com/prom-client/-/prom-client-14.1.0.tgz"; + sha512 = "iFWCchQmi4170omLpFXbzz62SQTmPhtBL35v0qGEVRHKcqIeiexaoYeP0vfZTujxEq3tA87iqOdRbC9svS1B9A=="; }; } { @@ -4106,19 +3842,11 @@ }; } { - name = "protobufjs___protobufjs_6.11.3.tgz"; + name = "protobufjs___protobufjs_7.1.1.tgz"; path = fetchurl { - name = "protobufjs___protobufjs_6.11.3.tgz"; - url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz"; - sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; - }; - } - { - name = "protobufjs___protobufjs_7.1.0.tgz"; - path = fetchurl { - name = "protobufjs___protobufjs_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.0.tgz"; - sha512 = "rCuxKlh0UQKSMjrpIcTLbR5TtGQ52cgs1a5nUoPBAKOccdPblN67BJtjrbtudUJK6HmBvUdsmymyYOzO7lxZEA=="; + name = "protobufjs___protobufjs_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.1.1.tgz"; + sha512 = "d0nMQqS/aT3lfV8bKi9Gbg73vPd2LcDdTDOu6RE/M+h9DY8g1EmDzk3ADPccthEWfTBjkR2oxNdx9Gs8YubT+g=="; }; } { @@ -4178,11 +3906,11 @@ }; } { - name = "puppeteer___puppeteer_13.7.0.tgz"; + name = "puppeteer___puppeteer_17.1.3.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_13.7.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.7.0.tgz"; - sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; + name = "puppeteer___puppeteer_17.1.3.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.3.tgz"; + sha512 = "tVtvNSOOqlq75rUgwLeDAEQoLIiBqmRg0/zedpI6fuqIocIkuxG23A7FIl1oVSkuSMMLgcOP5kVhNETmsmjvPw=="; }; } { @@ -4257,6 +3985,14 @@ sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } + { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.2.tgz"; + path = fetchurl { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"; + sha512 = "ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="; + }; + } { name = "readdirp___readdirp_3.6.0.tgz"; path = fetchurl { @@ -4426,35 +4162,11 @@ }; } { - name = "saxes___saxes_5.0.1.tgz"; + name = "saxes___saxes_6.0.0.tgz"; path = fetchurl { - name = "saxes___saxes_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; - }; - } - { - name = "semver_compare___semver_compare_1.0.0.tgz"; - path = fetchurl { - name = "semver_compare___semver_compare_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; - }; - } - { - name = "semver_regex___semver_regex_3.1.4.tgz"; - path = fetchurl { - name = "semver_regex___semver_regex_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.4.tgz"; - sha512 = "6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA=="; - }; - } - { - name = "semver___semver_5.7.1.tgz"; - path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + name = "saxes___saxes_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; + sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; }; } { @@ -4489,14 +4201,6 @@ sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - } { name = "setprototypeof___setprototypeof_1.2.0.tgz"; path = fetchurl { @@ -4546,11 +4250,11 @@ }; } { - name = "simple_get___simple_get_3.1.1.tgz"; + name = "simple_get___simple_get_4.0.1.tgz"; path = fetchurl { - name = "simple_get___simple_get_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz"; - sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; + name = "simple_get___simple_get_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } { @@ -4689,14 +4393,6 @@ sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; - }; - } { name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { @@ -4753,14 +4449,6 @@ sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } - { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; - }; - } { name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { @@ -4802,11 +4490,11 @@ }; } { - name = "supports_color___supports_color_5.5.0.tgz"; + name = "strtok3___strtok3_6.3.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + name = "strtok3___strtok3_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; } { @@ -4921,6 +4609,14 @@ sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; } + { + name = "token_types___token_types_4.2.1.tgz"; + path = fetchurl { + name = "token_types___token_types_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/token-types/-/token-types-4.2.1.tgz"; + sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ=="; + }; + } { name = "tough_cookie___tough_cookie_4.1.2.tgz"; path = fetchurl { @@ -4954,11 +4650,11 @@ }; } { - name = "ts_node___ts_node_10.5.0.tgz"; + name = "ts_node___ts_node_10.9.1.tgz"; path = fetchurl { - name = "ts_node___ts_node_10.5.0.tgz"; - url = "https://registry.yarnpkg.com/ts-node/-/ts-node-10.5.0.tgz"; - sha512 = "6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw=="; + name = "ts_node___ts_node_10.9.1.tgz"; + url = "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz"; + sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; }; } { @@ -5058,11 +4754,11 @@ }; } { - name = "typescript___typescript_4.7.4.tgz"; + name = "typescript___typescript_4.8.3.tgz"; path = fetchurl { - name = "typescript___typescript_4.7.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz"; - sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; + name = "typescript___typescript_4.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz"; + sha512 = "goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig=="; }; } { @@ -5082,19 +4778,19 @@ }; } { - name = "unique_filename___unique_filename_1.1.1.tgz"; + name = "unique_filename___unique_filename_2.0.1.tgz"; path = fetchurl { - name = "unique_filename___unique_filename_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + name = "unique_filename___unique_filename_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz"; + sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A=="; }; } { - name = "unique_slug___unique_slug_2.0.2.tgz"; + name = "unique_slug___unique_slug_3.0.0.tgz"; path = fetchurl { - name = "unique_slug___unique_slug_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + name = "unique_slug___unique_slug_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz"; + sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w=="; }; } { @@ -5138,11 +4834,11 @@ }; } { - name = "url_value_parser___url_value_parser_2.1.0.tgz"; + name = "url_value_parser___url_value_parser_2.2.0.tgz"; path = fetchurl { - name = "url_value_parser___url_value_parser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz"; - sha512 = "gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw=="; + name = "url_value_parser___url_value_parser_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.2.0.tgz"; + sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A=="; }; } { @@ -5241,14 +4937,6 @@ sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; }; } - { - name = "whatwg_url___whatwg_url_10.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz"; - sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; - }; - } { name = "whatwg_url___whatwg_url_11.0.0.tgz"; path = fetchurl { @@ -5273,14 +4961,6 @@ sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } - { - name = "which_pm_runs___which_pm_runs_1.1.0.tgz"; - path = fetchurl { - name = "which_pm_runs___which_pm_runs_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.1.0.tgz"; - sha512 = "n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA=="; - }; - } { name = "which___which_2.0.2.tgz"; path = fetchurl { @@ -5289,14 +4969,6 @@ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } - { - name = "wide_align___wide_align_1.1.5.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - } { name = "winston_transport___winston_transport_4.5.0.tgz"; path = fetchurl { @@ -5306,11 +4978,11 @@ }; } { - name = "winston___winston_3.8.1.tgz"; + name = "winston___winston_3.8.2.tgz"; path = fetchurl { - name = "winston___winston_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.8.1.tgz"; - sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w=="; + name = "winston___winston_3.8.2.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz"; + sha512 = "MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew=="; }; } { @@ -5345,14 +5017,6 @@ sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } - { - name = "ws___ws_8.5.0.tgz"; - path = fetchurl { - name = "ws___ws_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; - sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; - }; - } { name = "ws___ws_8.8.1.tgz"; path = fetchurl { @@ -5433,14 +5097,6 @@ sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } - { - 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"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - } { name = "yaml___yaml_2.1.1.tgz"; path = fetchurl { From 8c513b21713b90593d1a9e64f16c8ab1b3f53e75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 13:17:53 +0000 Subject: [PATCH 140/182] thedesk: 24.0.10 -> 24.1.2 --- pkgs/applications/misc/thedesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 8e4a671c4a64..bfb20c5ccbdd 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.0.10"; + version = "24.1.2"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0="; + sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU="; }; nativeBuildInputs = [ From 4f855640e1e8b93e1a9da3d9748d4e2e8e2b274a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 13:29:38 +0000 Subject: [PATCH 141/182] cloud-init: 23.1.1 -> 23.1.2 --- pkgs/tools/virtualization/cloud-init/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 53e6a3a612fe..44b47a2ac6d0 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -16,14 +16,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.1.1"; + version = "23.1.2"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-w1UP7JIt/+6UlASB8kv2Lil+1sMTDIrADoYOT/WtaeE="; + hash = "sha256-tn4flcrf04hVWhqkmK4qDenXcnV93pP+C+8J63b6FXQ="; }; patches = [ ./0001-add-nixos-support.patch ./0002-Add-Udhcpc-support.patch ]; From 074b1277b9d530d56d0e52223810a5a7e262817e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 13:59:58 +0000 Subject: [PATCH 142/182] loksh: 7.2 -> 7.3 --- pkgs/shells/loksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/loksh/default.nix b/pkgs/shells/loksh/default.nix index 469271ecf1ad..d646e91e286b 100644 --- a/pkgs/shells/loksh/default.nix +++ b/pkgs/shells/loksh/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "loksh"; - version = "7.2"; + version = "7.3"; src = fetchFromGitHub { owner = "dimkr"; repo = finalAttrs.pname; rev = finalAttrs.version; fetchSubmodules = true; - sha256 = "sha256-Dnt1xo/5URs5yiNtj75a5K/qGJ+0lirPExnG+0xLuq8="; + sha256 = "sha256-djjJH+mknmOfleVJhSkCLqCIaELh2gjZZE/xdNZuPtY="; }; nativeBuildInputs = [ From 772b06df7c4f9c42a2b3b0bf2eb77159b93ad3c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 14:08:23 +0000 Subject: [PATCH 143/182] libwmf: 0.2.12 -> 0.2.13 --- pkgs/development/libraries/libwmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index e6d598b54bac..b42e09894db8 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libwmf"; - version = "0.2.12"; + version = "0.2.13"; outputs = [ "out" "dev" ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "caolanm"; repo = pname; rev = "v${version}"; - sha256 = "0i2w5hg8mbgmgabxyd48qp1gx2mhk33hgr3jqvg72k0nhkd2jhf6"; + sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M="; }; nativeBuildInputs = [ pkg-config ]; From 0d8d3e7fc38b94455f2cfa591d5761923713456d Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 27 Apr 2023 14:20:00 +0200 Subject: [PATCH 144/182] runc: 1.1.6 -> 1.1.7 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index c1cdf18d856f..b23c35c51394 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-vcOOkpUywDqHW+ZZO0tSsMmJp3gSvyRy/nVrn1deLY0="; + hash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU="; }; vendorHash = null; From b436e6312656acae8cf0f1dd8ddef72c87240941 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 14:48:33 +0000 Subject: [PATCH 145/182] jadx: 1.4.6 -> 1.4.7 --- pkgs/tools/security/jadx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 34fe78aabb00..2911c369b0b7 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-nxEK2K6id1Rnqo85ls6YEHXrhc9ykJU17+olGqg+aGA="; + hash = "sha256-3t2e3WfH/ohkdGWlfV3t9oHJ1Q6YM6nSLOgmzgJEkls="; }; deps = stdenv.mkDerivation { From 2a172875f7059cd9c41aae3b7eb99f5f00f1fe69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 17:11:36 +0200 Subject: [PATCH 146/182] checkov: 2.3.199 -> 2.3.202 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.199...2.3.202 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.202 --- pkgs/development/tools/analysis/checkov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 8917ff369d00..3f35f17181d8 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.199"; + version = "2.3.202"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JwEI+i6xvO8wsCCAliljXxddL3T6MWzHvzMmewNlbsk="; + hash = "sha256-cJGHby6g4ndz031vxLFmQ9yUAB6lsyGff3eM8vjxUbc="; }; patches = [ @@ -116,7 +116,7 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.199 + # Starting to fail after 2.3.202 "test_non_multiline_pair" ]; From 7cd0043499a62b961036f583749ca3f9c3780447 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 17:14:05 +0200 Subject: [PATCH 147/182] python310Packages.fakeredis: 2.11.0 -> 2.11.1 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.11.0...v2.11.1 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.11.1 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 3c2a6671ea2c..71b9e4d915ec 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.11.0"; + version = "2.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-R9fB8Y22HPFxMtFQJmmbxZWh6qUtbXrWFUetaOKRFlg="; + hash = "sha256-nV/YZFgy4IagdJRLeg1rLTe7f2NsVnvizyMQrJhlrik="; }; nativeBuildInputs = [ From 7d12f0f413a31a1d92f91b0a5652cc7a2cde02a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 17:17:07 +0200 Subject: [PATCH 148/182] feroxbuster: 2.9.4 -> 2.9.5 Diff: https://github.com/epi052/feroxbuster/compare/refs/tags/v2.9.4...v2.9.5 Changelog: https://github.com/epi052/feroxbuster/releases/tag/v2.9.5 --- pkgs/tools/security/feroxbuster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index db0f5e724d33..c84037032a49 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "epi052"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9PLj5tORWE4A6MWU9DF6JUbRebTOswIC/Jg6aq6SUPc="; + hash = "sha256-+cjRfuUspq9eE5PsYgha0Vj1ELHjTUxxdM7yR3L9T2k="; }; # disable linker overrides on aarch64-linux @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-Kest8QCfiS0F8pw1PULny7iuYf9oILiZykPsL2ZSskQ="; + cargoHash = "sha256-yd97iiKjMIlMhilU0L1yngNIKptv4I0nEIKWRfhx/40="; OPENSSL_NO_VENDOR = true; From 37df296b0f166a9d83adad69a19a7abcdec553e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 17:18:01 +0200 Subject: [PATCH 149/182] qovery-cli: 0.58.6 -> 0.58.7 Diff: https://github.com/Qovery/qovery-cli/compare/v0.58.6...v0.58.7 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.58.7 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 140b536dfcae..61e0d64fdc13 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.58.6"; + version = "0.58.7"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-LgxI0W3t1HyJEP8XBHd59LU3YUV0EOOnysmChOzWURs="; + hash = "sha256-96tbVlFvKe8ExgOhTeiDiq51NHTrh1BzBVp6omcydXg="; }; vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0="; From c37d673e4280ac26fde2b371b4fdda6cedd9c076 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Thu, 27 Apr 2023 09:26:28 -0600 Subject: [PATCH 150/182] tidal-hifi: 5.0.0 -> 5.1.0 - Remove icon generation as upstream includes them now --- pkgs/applications/audio/tidal-hifi/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index cecfbaca8120..f3a16e89df82 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -18,7 +18,6 @@ , gdk-pixbuf , glib , gtk3 -, imagemagick , libappindicator-gtk3 , libdbusmenu , libdrm @@ -37,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-6NyHDH16bLs+bgSbjZYm2LEzp1WkJ1nO3sdkO78/VqE="; + sha256 = "sha256-IaSgul2L0L343TVT3ujgBoMt6tITwjJaBNOVJPCBDtI="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 - imagemagick pango systemd mesa # for libgbm @@ -110,12 +108,6 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" - - for size in 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ - convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \ - -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png - done ''; meta = with lib; { From bd466f9ac0ee18776cd5b8181b564fc6b63aae46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 27 Apr 2023 17:20:28 +0200 Subject: [PATCH 151/182] taskjuggler: remove old/unused 3.x files Somehow we have an old and unused taskjuggler-3.5.0 expr. Remove it. --- .../applications/misc/taskjuggler/3.x/Gemfile | 2 - .../misc/taskjuggler/3.x/Gemfile.lock | 21 --------- .../misc/taskjuggler/3.x/default.nix | 15 ------ .../misc/taskjuggler/3.x/gemset.nix | 47 ------------------- 4 files changed, 85 deletions(-) delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/default.nix delete mode 100644 pkgs/applications/misc/taskjuggler/3.x/gemset.nix diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/3.x/Gemfile deleted file mode 100644 index 77cbaeeed793..000000000000 --- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'http://rubygems.org' -gem 'taskjuggler' diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock deleted file mode 100644 index 8831993117d2..000000000000 --- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock +++ /dev/null @@ -1,21 +0,0 @@ -GEM - remote: http://rubygems.org/ - specs: - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - taskjuggler (3.5.0) - mail (>= 2.4.3) - term-ansicolor (>= 1.0.7) - term-ansicolor (1.3.2) - tins (~> 1.0) - tins (1.6.0) - -PLATFORMS - ruby - -DEPENDENCIES - taskjuggler - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix deleted file mode 100644 index d3a8e26a4d82..000000000000 --- a/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, bundlerEnv, ruby }: - -bundlerEnv { - name = "taskjuggler-3.5.0"; - - inherit ruby; - gemdir = ./.; - - meta = { - description = "A modern and powerful project management tool"; - homepage = "https://taskjuggler.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix deleted file mode 100644 index deeeac106943..000000000000 --- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - mail = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - mime-types = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; - }; - }; - taskjuggler = { - version = "3.5.0"; - source = { - type = "gem"; - sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2"; - }; - dependencies = [ - "mail" - "term-ansicolor" - ]; - }; - term-ansicolor = { - version = "1.3.2"; - source = { - type = "gem"; - sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys"; - }; - dependencies = [ - "tins" - ]; - }; - tins = { - version = "1.6.0"; - source = { - type = "gem"; - sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz"; - }; - }; -} From 938afbb96edba3dd28065f5f2d42a86e9714bab3 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Thu, 27 Apr 2023 15:53:39 +0200 Subject: [PATCH 152/182] postgresqlPackages.timescaledb: 2.10.2 -> 2.10.3 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 40387e48a33c..1422fb3f90c2 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.10.2"; + version = "2.10.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-CUmSIeIPmUONZYCI0AlXng/1Vhq6t1RC6gvgIYa5A9k="; + sha256 = "sha256-gI5zPEg2jKQhK63E2rvPd6laF3dmP52oHg/UMitHifk="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] From 7b13b02405a3ca9fd710489883e7b740983175f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Apr 2023 17:35:14 +0000 Subject: [PATCH 153/182] open-stage-control: 1.23.0 -> 1.24.2 --- pkgs/applications/audio/open-stage-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index caab41a11436..1377598f807e 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.23.0"; + version = "1.24.2"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-5QMBJw6H9TmyoSMkG5rniq1BdVYuEtQsQF1GGBkxqMI="; + hash = "sha256-mM81u1irVfFFJUddOXKcs46tcGwVAcir+daKdkxFLsE="; }; # Remove some Electron stuff from package.json From ca0c89900851906da9029019e2badde583c853ac Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 27 Apr 2023 11:59:05 -0600 Subject: [PATCH 154/182] nixos(steam): fix when gamescope isn't enabled --- nixos/modules/programs/steam.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 28985b8db17c..78001116764e 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -84,6 +84,7 @@ in { gamescopeSession = mkOption { description = mdDoc "Run a GameScope driven Steam session from your display-manager"; + default = {}; type = types.submodule { options = { enable = mkEnableOption (mdDoc "GameScope Session"); From b866d85d5cd2d3f518a00a154513f520180cc3d5 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Thu, 27 Apr 2023 11:59:25 -0600 Subject: [PATCH 155/182] nixos(steam): install steam-gamescope Allows to launch from a tty, in addition to display-manager. --- nixos/modules/programs/steam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 78001116764e..c63b31bde11f 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -136,7 +136,7 @@ in { environment.systemPackages = [ cfg.package cfg.package.run - ]; + ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope; networking.firewall = lib.mkMerge [ (mkIf cfg.remotePlay.openFirewall { From 4cdc34959b66e7613bc246c1557ac4eb91b2ee1c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:11:16 +0300 Subject: [PATCH 156/182] openscenegraph: fix build on darwin --- pkgs/development/libraries/openscenegraph/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 891c5121b0e7..8fc4539c6687 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, - AGL, Carbon, Cocoa, Foundation, + AGL, Accelerate, Carbon, Cocoa, Foundation, boost, jpegSupport ? true, libjpeg, exrSupport ? false, openexr, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk ] - ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] + ++ lib.optionals stdenv.isDarwin [ AGL Accelerate Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82e27448e190..f122e99aed67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23064,7 +23064,7 @@ with pkgs; opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Foundation; + inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation; }; openslide = callPackage ../development/libraries/openslide { }; From 3b172df71c982b9e914837a7d056fa785dae8782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Apr 2023 17:06:36 +0200 Subject: [PATCH 157/182] nodePackages.node2nix: add wrongly removed patch back Thanks for catching lilyinstarlight! --- pkgs/development/node-packages/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 73ccd8112863..a7e827fb163f 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -347,6 +347,12 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = let patches = [ + # Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314 + (fetchpatch { + name = "convert-crlf-for-script-bin-files.patch"; + url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch"; + hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU="; + }) # fix nodejs attr names (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch"; From 288edda34e2de148c6cfb5b46993deda570ec161 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 27 Apr 2023 20:19:55 +0200 Subject: [PATCH 158/182] python3Packages.latex2mathml: 3.75.2 -> 3.75.3 --- pkgs/development/python-modules/latex2mathml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/latex2mathml/default.nix b/pkgs/development/python-modules/latex2mathml/default.nix index 8737f0ef31da..572038eb3149 100644 --- a/pkgs/development/python-modules/latex2mathml/default.nix +++ b/pkgs/development/python-modules/latex2mathml/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "latex2mathml"; - version = "3.75.2"; + version = "3.75.3"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "roniemartinez"; repo = pname; rev = version; - hash = "sha256-i/F1B/Rndg66tiKok1PDMK/rT5c2e8upnQrMSCTUzpU="; + hash = "sha256-i1OJ6hmF04cdDOG1gfyseCJu+e0LEr1I3UwLXbdQJqQ="; }; format = "pyproject"; From dd05a95591047375f005de308380fc0af875fabc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 7 Jan 2022 18:29:59 +0800 Subject: [PATCH 159/182] alephone: fix cross compilation by setting AR in makeFlags --- pkgs/games/alephone/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 98b21865d7ca..0a88c91e8a84 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -39,6 +39,7 @@ let ]; configureFlags = [ "--with-boost=${boost}" ]; + makeFlags = [ "AR:=$(AR)" ]; enableParallelBuilding = true; From dfcc29fe27efff078d2a05a1d579583c0ef2a4e4 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 27 Apr 2023 21:15:41 +0200 Subject: [PATCH 160/182] pkgsMusl.gtk4: fix build (#228560) --- pkgs/development/libraries/gtk/4.x.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index fe3549eee572..f801f83c9895 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -48,6 +48,7 @@ , cups , AppKit , Cocoa +, libexecinfo , broadwaySupport ? true }: @@ -138,6 +139,8 @@ stdenv.mkDerivation rec { cups ] ++ lib.optionals stdenv.isDarwin [ Cocoa + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + libexecinfo ]; #TODO: colord? @@ -180,7 +183,11 @@ stdenv.mkDerivation rec { # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + env = { + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; + } // lib.optionalAttrs stdenv.hostPlatform.isMusl { + NIX_LDFLAGS = "-lexecinfo"; + }; postPatch = '' files=( From 1e07e5480d8fceac95be7eaaced4885d1859ed85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 26 Apr 2023 15:36:41 -0600 Subject: [PATCH 161/182] =?UTF-8?q?digikam:=207.9.0=20=E2=86=92=207.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 9f68964f424e..263bfe490ba7 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -56,11 +56,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - sha256 = "sha256-w7gKvAkNo8u8QuZ6QDCA1/X+CnyYaYc1vaVWxgMUurQ="; + sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; From d5904d7e6b57d82212be4db9745633fd93925f37 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:59:28 +0300 Subject: [PATCH 162/182] squashfsTools: fix build on darwin --- pkgs/tools/filesystems/squashfs/darwin.patch | 357 ------------------- pkgs/tools/filesystems/squashfs/default.nix | 2 +- 2 files changed, 1 insertion(+), 358 deletions(-) delete mode 100644 pkgs/tools/filesystems/squashfs/darwin.patch diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch deleted file mode 100644 index 657971c5b0ab..000000000000 --- a/pkgs/tools/filesystems/squashfs/darwin.patch +++ /dev/null @@ -1,357 +0,0 @@ -Patch based on commits by Dave Vasilevsky and -Blake Riley , squashed into a single patch, -with BSD-specific changes omitted. - -See also https://github.com/plougher/squashfs-tools/pull/69. - -diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index ea2f604..9c979f8 100644 ---- a/squashfs-tools/action.c -+++ b/squashfs-tools/action.c -@@ -39,6 +39,10 @@ - #include - #include - -+#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 -+#endif -+ - #include "squashfs_fs.h" - #include "mksquashfs.h" - #include "action.h" -@@ -2415,9 +2419,12 @@ static char *get_start(char *s, int n) - - static int subpathname_fn(struct atom *atom, struct action_data *action_data) - { -- return fnmatch(atom->argv[0], get_start(strdupa(action_data->subpath), -+ char *path = strdup(action_data->subpath); -+ int is_match = fnmatch(atom->argv[0], get_start(path, - count_components(atom->argv[0])), - FNM_PATHNAME|FNM_EXTMATCH) == 0; -+ free(path); -+ return is_match; - } - - /* -diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c -index 216b979..eea2ec9 100644 ---- a/squashfs-tools/info.c -+++ b/squashfs-tools/info.c -@@ -144,31 +144,22 @@ void dump_state() - void *info_thrd(void *arg) - { - sigset_t sigmask; -- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; -- int sig, waiting = 0; -+ int sig, err, waiting = 0; - - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); - - while(1) { -- if(waiting) -- sig = sigtimedwait(&sigmask, NULL, ×pec); -- else -- sig = sigwaitinfo(&sigmask, NULL); -+ err = sigwait(&sigmask, &sig); - -- if(sig == -1) { -+ if(err == -1) { - switch(errno) { -- case EAGAIN: -- /* interval timed out */ -- waiting = 0; -- /* FALLTHROUGH */ - case EINTR: -- /* if waiting, the wait will be longer, but -- that's OK */ - continue; - default: -- BAD_ERROR("sigtimedwait/sigwaitinfo failed " -+ BAD_ERROR("sigwait failed " - "because %s\n", strerror(errno)); - } - } -@@ -179,8 +170,12 @@ void *info_thrd(void *arg) - /* set one second interval period, if ^\ received - within then, dump queue and cache status */ - waiting = 1; -- } else -+ alarm(1); -+ } else if (sig == SIGQUIT) { - dump_state(); -+ } else if (sig == SIGALRM) { -+ waiting = 0; -+ } - } - } - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 843f9f4..ed2c3a6 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -35,7 +35,12 @@ - #include - #include - #include -+#ifndef linux -+#include -+#else -+#include - #include -+#endif - #include - #include - #include -@@ -50,7 +55,10 @@ - #include - #include - #include --#include -+ -+#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 -+#endif - - #ifndef linux - #include -@@ -5064,6 +5072,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq, - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) - BAD_ERROR("Failed to set signal mask in intialise_threads\n"); - -@@ -5802,6 +5811,35 @@ static int get_physical_memory() - long long page_size = sysconf(_SC_PAGESIZE); - int phys_mem; - -+#ifndef linux -+ #ifdef HW_MEMSIZE -+ #define SYSCTL_PHYSMEM HW_MEMSIZE -+ #elif defined(HW_PHYSMEM64) -+ #define SYSCTL_PHYSMEM HW_PHYSMEM64 -+ #else -+ #define SYSCTL_PHYSMEM HW_PHYSMEM -+ #endif -+ -+ int mib[2]; -+ uint64_t sysctl_physmem = 0; -+ size_t sysctl_len = sizeof(sysctl_physmem); -+ -+ mib[0] = CTL_HW; -+ mib[1] = SYSCTL_PHYSMEM; -+ -+ if(sysctl(mib, 2, &sysctl_physmem, &sysctl_len, NULL, 0) == 0) { -+ /* some systems use 32-bit values, work with what we're given */ -+ if (sysctl_len == 4) -+ sysctl_physmem = *(uint32_t*)&sysctl_physmem; -+ phys_mem = sysctl_physmem >> 20; -+ } else { -+ ERROR_START("Failed to get amount of available " -+ "memory."); -+ ERROR_EXIT(" Defaulting to least viable amount\n"); -+ phys_mem = SQUASHFS_LOWMEM; -+ } -+ #undef SYSCTL_PHYSMEM -+#else - if(num_pages == -1 || page_size == -1) { - struct sysinfo sys; - int res = sysinfo(&sys); -@@ -5814,6 +5852,7 @@ static int get_physical_memory() - } - - phys_mem = num_pages * page_size >> 20; -+#endif - - if(phys_mem < SQUASHFS_LOWMEM) - BAD_ERROR("Mksquashfs requires more physical memory than is " -diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c -index 2067f80..ca8b7f4 100644 ---- a/squashfs-tools/read_xattrs.c -+++ b/squashfs-tools/read_xattrs.c -@@ -31,13 +31,13 @@ - #include - #include - -+#include -+ - #include "squashfs_fs.h" - #include "squashfs_swap.h" - #include "xattr.h" - #include "error.h" - --#include -- - extern int read_fs_bytes(int, long long, long long, void *); - extern int read_block(int, long long, long long *, int, void *); - -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index d434b42..1208e45 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -32,8 +32,12 @@ - #include "stdarg.h" - #include "fnmatch_compat.h" - -+#ifndef linux -+#include -+#else - #include - #include -+#endif - #include - #include - #include -@@ -1182,7 +1186,7 @@ int create_inode(char *pathname, struct inode *i) - break; - case SQUASHFS_SYMLINK_TYPE: - case SQUASHFS_LSYMLINK_TYPE: { -- struct timespec times[2] = { -+ struct timeval times[2] = { - { i->time, 0 }, - { i->time, 0 } - }; -@@ -1201,8 +1205,7 @@ int create_inode(char *pathname, struct inode *i) - goto failed; - } - -- res = utimensat(AT_FDCWD, pathname, times, -- AT_SYMLINK_NOFOLLOW); -+ res = lutimes(pathname, times); - if(res == -1) { - EXIT_UNSQUASH_STRICT("create_inode: failed to" - " set time on %s, because %s\n", -@@ -2687,6 +2690,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_ - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); - if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0) - EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n"); - -diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index 1099678..5b6a038 100644 ---- a/squashfs-tools/unsquashfs.h -+++ b/squashfs-tools/unsquashfs.h -@@ -46,6 +46,10 @@ - #include - #include - -+#ifndef FNM_EXTMATCH /* glibc extension */ -+ #define FNM_EXTMATCH 0 -+#endif -+ - #include "endian_compat.h" - #include "squashfs_fs.h" - #include "unsquashfs_error.h" -diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c -index e906eaf..f1e68c2 100644 ---- a/squashfs-tools/unsquashfs_info.c -+++ b/squashfs-tools/unsquashfs_info.c -@@ -96,31 +96,22 @@ void dump_state() - void *info_thrd(void *arg) - { - sigset_t sigmask; -- struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 }; -- int sig, waiting = 0; -+ int sig, err, waiting = 0; - - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGQUIT); - sigaddset(&sigmask, SIGHUP); -+ sigaddset(&sigmask, SIGALRM); - - while(1) { -- if(waiting) -- sig = sigtimedwait(&sigmask, NULL, ×pec); -- else -- sig = sigwaitinfo(&sigmask, NULL); -+ err = sigwait(&sigmask, &sig); - -- if(sig == -1) { -+ if(err == -1) { - switch(errno) { -- case EAGAIN: -- /* interval timed out */ -- waiting = 0; -- /* FALLTHROUGH */ - case EINTR: -- /* if waiting, the wait will be longer, but -- that's OK */ - continue; - default: -- BAD_ERROR("sigtimedwait/sigwaitinfo failed " -+ BAD_ERROR("sigwait failed " - "because %s\n", strerror(errno)); - } - } -@@ -132,8 +123,12 @@ void *info_thrd(void *arg) - /* set one second interval period, if ^\ received - within then, dump queue and cache status */ - waiting = 1; -- } else -+ alarm(1); -+ } else if (sig == SIGQUIT) { - dump_state(); -+ } else if (sig == SIGALRM) { -+ waiting = 0; -+ } - } - } - -diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c -index 61910e1..73e0090 100644 ---- a/squashfs-tools/unsquashfs_xattr.c -+++ b/squashfs-tools/unsquashfs_xattr.c -@@ -27,6 +27,11 @@ - - #include - -+#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define lsetxattr(path_, name_, val_, sz_, flags_) \ -+ setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW) -+#endif -+ - #define NOSPACE_MAX 10 - - extern int root_process; -diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c -index b1c0089..6d7ed98 100644 ---- a/squashfs-tools/xattr.c -+++ b/squashfs-tools/xattr.c -@@ -22,6 +22,14 @@ - * xattr.c - */ - -+#ifndef linux -+#define __BYTE_ORDER BYTE_ORDER -+#define __BIG_ENDIAN BIG_ENDIAN -+#define __LITTLE_ENDIAN LITTLE_ENDIAN -+#else -+#include -+#endif -+ - #define TRUE 1 - #define FALSE 0 - -@@ -36,6 +44,13 @@ - #include - #include - -+#ifdef XATTR_NOFOLLOW /* Apple's xattrs */ -+ #define llistxattr(path_, buf_, sz_) \ -+ listxattr(path_, buf_, sz_, XATTR_NOFOLLOW) -+ #define lgetxattr(path_, name_, val_, sz_) \ -+ getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW) -+#endif -+ - #include "squashfs_fs.h" - #include "squashfs_swap.h" - #include "mksquashfs.h" --- -2.35.1 - diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index b1b6efc6993b..02b380a230f9 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # This patch adds an option to pad filesystems (increasing size) in # exchange for better chunking / binary diff calculation. ./4k-align.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ]; strictDeps = true; nativeBuildInputs = [ which ] From 6bda19fb912049d6801b3402225a3ee6fdce6cef Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 16:19:05 +0000 Subject: [PATCH 163/182] hello-wayland: add update script --- pkgs/applications/graphics/hello-wayland/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index 7ecc43c44907..d3934fb8b8d4 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub , imagemagick, pkg-config, wayland, wayland-protocols +, unstableGitUpdater }: stdenv.mkDerivation { @@ -23,6 +24,8 @@ stdenv.mkDerivation { runHook postBuild ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Hello world Wayland client"; homepage = "https://github.com/emersion/hello-wayland"; From 36233d967522af6e072cc1c45d1b9f9c8f531310 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 16:19:17 +0000 Subject: [PATCH 164/182] hello-wayland: unstable-2023-03-16 -> unstable-2023-04-23 --- pkgs/applications/graphics/hello-wayland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index d3934fb8b8d4..afc8e76405aa 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "hello-wayland"; - version = "unstable-2023-03-16"; + version = "unstable-2023-04-23"; src = fetchFromGitHub { owner = "emersion"; repo = "hello-wayland"; - rev = "f6a8203309977af03cda94765dd61367c189bea6"; - sha256 = "FNtc6OApW/epAFortvujNVWJJVI44IY+Pa0qU0QdecA="; + rev = "77e270c19672f3ad863e466093f429cde8eb1f16"; + sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04="; }; nativeBuildInputs = [ imagemagick pkg-config ]; From dbed54656c61498e30530bb00a098b9b272d9c90 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Apr 2023 20:28:51 +0000 Subject: [PATCH 165/182] river-tag-overlay: fix cross --- .../misc/river-tag-overlay/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix index 4aa2a3c59a97..0cec751a199c 100644 --- a/pkgs/applications/misc/river-tag-overlay/default.nix +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }: +{ lib, stdenv, fetchFromSourcehut, fetchpatch +, wayland, pixman, pkg-config, wayland-scanner +}: stdenv.mkDerivation rec { pname = "river-tag-overlay"; @@ -11,8 +13,16 @@ stdenv.mkDerivation rec { hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E="; }; + patches = [ + # Backport cross fix. + (fetchpatch { + url = "https://git.sr.ht/~leon_plickat/river-tag-overlay/commit/791eaadf46482121a4c811ffba13d03168d74d8f.patch"; + sha256 = "CxSDcweHGup1EF3oD/2vhP6RFoeYorj0BwmlgA3tbPE="; + }) + ]; + buildInputs = [ pixman wayland ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; makeFlags = [ "DESTDIR=${placeholder "out"}" From 2e2d5d6f1136dbce0a8b558a35b2bc4ddf3d9831 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Apr 2023 20:28:59 +0000 Subject: [PATCH 166/182] river-tag-overlay: unmark broken on aarch64 This package didn't build on aarch64 when it was added, but now it does. In the meantime we bumped the default GCC on aarch64, so presumably that fixed it. --- pkgs/applications/misc/river-tag-overlay/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix index 0cec751a199c..902f6e816148 100644 --- a/pkgs/applications/misc/river-tag-overlay/default.nix +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ edrex ]; platforms = platforms.linux; - broken = stdenv.isAarch64; }; } From 3d409345416cda845407e3075f5eaf7a590d9db5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 13:39:45 +0000 Subject: [PATCH 167/182] rofi-wayland: fix cross --- pkgs/applications/misc/rofi/wayland.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index d6e6946af547..dfb096d654d6 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , rofi-unwrapped +, wayland-scanner , wayland-protocols , wayland }: @@ -18,8 +19,8 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { sha256 = "sha256-ddKLV7NvqgTQl5YlAEyBK0oalcJsLASK4z3qArQPUDQ="; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ]; - buildInputs = oldAttrs.buildInputs ++ [ wayland ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; + buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ]; meta = with lib; { description = "Window switcher, run dialog and dmenu replacement for Wayland"; From 26dd4a84edb018d06936ebbe48b6af029138e796 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 24 Apr 2023 23:07:03 +0200 Subject: [PATCH 168/182] buildLuarocksPackage: fixes attributes being ignored follow up of https://github.com/NixOS/nixpkgs/pull/224553 where some arguments got ignored whil they were before taken into account. --- .../interpreters/lua-5/build-lua-package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index adba03873aa6..eeca9b11ad05 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -83,11 +83,10 @@ let __structuredAttrs = true; env = { LUAROCKS_CONFIG="$PWD/${luarocks_config}"; - }; + } // attrs.env or {}; generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec"; - nativeBuildInputs = [ wrapLua lua.pkgs.luarocks @@ -99,6 +98,7 @@ let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps; in [ lua.pkgs.luarocks ] + ++ buildInputs ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs) ++ (map (d: d.dep) externalDeps') ; @@ -200,15 +200,15 @@ let ''; passthru = { - inherit lua; # The lua interpreter - }; + inherit lua; + } // attrs.passthru or { }; meta = { platforms = lua.meta.platforms; # add extra maintainer(s) to every package maintainers = (attrs.meta.maintainers or []) ++ [ ]; broken = disabled; - } // attrs.meta; + } // attrs.meta or {}; })); in luarocksDrv From 36302a3056631dc66d73c7a6343950fdb1750e77 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:22:33 +0300 Subject: [PATCH 169/182] root: fix build on aarch64-darwin --- pkgs/applications/science/misc/root/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 2ebfd4a1a87a..c98c50273f47 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -208,6 +208,9 @@ stdenv.mkDerivation rec { # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found # fatal error: could not build module '_Builtin_intrinsics' "-Druntime_cxxmodules=OFF" + + # At least C++17 standard required with root7 + "-DCMAKE_CXX_STANDARD=17" ]; # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. From 13e9ef736a8f4458172d324de0a784d4c6167e9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 22:30:32 +0200 Subject: [PATCH 170/182] python310Packages.adlfs: 2023.1.0 -> 2023.4.0 Diff: https://github.com/fsspec/adlfs/compare/refs/tags/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/adlfs/blob/2023.4.0/CHANGELOG.md --- pkgs/development/python-modules/adlfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index 53c09cfa019f..9d73c93cef55 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2023.1.0"; + version = "2023.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY="; + hash = "sha256-olXOMmUBfamOrwtS0SEFGW3Z7g+ExWHxON9SKKSxnbc="; }; propagatedBuildInputs = [ From 28211c5c65c83de8f327e5f61e5dd4e73facb705 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:33:06 +0300 Subject: [PATCH 171/182] python310Packages.uamqp: fix build on aarch64-darwin --- pkgs/development/python-modules/uamqp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 24d2b7b34630..2ae0d32a5679 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -40,6 +40,9 @@ buildPythonPackage rec { sed -i \ -e '/#define EVP_PKEY_id/d' \ src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/adapters/x509_openssl.c + sed -z -i \ + -e 's/OpenSSL 3\nif(LINUX)/OpenSSL 3\nif(1)/' \ + src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt ''; nativeBuildInputs = [ From 337a4cc448551f1f47e973a484b3e5dab23f29a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Apr 2023 22:35:06 +0200 Subject: [PATCH 172/182] python310Packages.pytibber: 0.27.1 -> 0.27.2 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.27.1...0.27.2 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.27.2 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 8c25f17bb8b3..33a61c2582ee 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.27.1"; + version = "0.27.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-KmUzXlINRbtyzZCoG4d2Xc57g07d+x7bdoq/DtMmtqM="; + hash = "sha256-8JeQvvCxKAmFy8kiXVD+l1EBv5mO1rWYoAg+iLjapRw="; }; propagatedBuildInputs = [ From 53264e7daa7952967d1a7bd3ee194e93f336bacb Mon Sep 17 00:00:00 2001 From: Quentin JOLY <82603435+QJoly@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:41:45 +0000 Subject: [PATCH 173/182] kubecm: init at 0.22.1 fix lint --- .../networking/cluster/kubecm/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubecm/default.nix diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix new file mode 100644 index 000000000000..279ac3f0329d --- /dev/null +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubecm"; + version = "0.22.1"; + + src = fetchFromGitHub { + owner = "sunny0826"; + repo = "kubecm"; + rev = "v${version}"; + hash = "sha256-0oQOuBYCDNnOODM2ZSqTgOI+jHWuHTtsk2NfGIPMy5A="; + }; + + vendorHash = "sha256-fVPiEDB6WFu2x5EY7NjmJEEq297QxP10593cXxxv8iI="; + ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; + + doCheck = false; + + meta = with lib; { + description = "Manage your kubeconfig more easily"; + homepage = "https://github.com/sunny0826/kubecm/"; + license = licenses.asl20; + maintainers = with maintainers; [ qjoly ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a8afdff022f..58f9b8f9a687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31620,6 +31620,8 @@ with pkgs; k9s = callPackage ../applications/networking/cluster/k9s { }; + kubecm = callPackage ../applications/networking/cluster/kubecm { }; + ktunnel = callPackage ../applications/networking/cluster/ktunnel { }; ktop = callPackage ../applications/networking/cluster/ktop { }; From ea88f8313ea31b0e76cac6a396dab416dc93b014 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:55:28 +0300 Subject: [PATCH 174/182] qscintilla: remove from libsForQt5 --- pkgs/top-level/qt5-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index ce2d13ed52e9..6de840951521 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -192,8 +192,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = callPackage ../development/libraries/qscintilla { }; - qt5ct = callPackage ../tools/misc/qt5ct { }; qtdbusextended = callPackage ../development/libraries/qtdbusextended { }; From 53e5cca730d5c8ad562328e166fe10526e647b48 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 27 Apr 2023 00:28:50 +0200 Subject: [PATCH 175/182] vimPlugins.vim-solarized8: init at 2023-02-25 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9a3100d33369..f2a7de9cbb1e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13209,6 +13209,18 @@ final: prev: meta.homepage = "https://github.com/honza/vim-snippets/"; }; + vim-solarized8 = buildVimPluginFrom2Nix { + pname = "vim-solarized8"; + version = "2023-02-25"; + src = fetchFromGitHub { + owner = "lifepillar"; + repo = "vim-solarized8"; + rev = "bcd4e74e9850fd59ee0294a5c3ae958ed535cc52"; + sha256 = "00qhqy511wdcmlsglwhqsd6gffagjmdz0wl5627a3nwmxs8p45sa"; + }; + meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; + }; + vim-solidity = buildVimPluginFrom2Nix { pname = "vim-solidity"; version = "2018-04-17"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f8f72b955770..1c3312d3b92b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1110,6 +1110,7 @@ https://github.com/justinmk/vim-sneak/,, https://github.com/garbas/vim-snipmate/,, https://github.com/honza/vim-snippets/,, https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets +https://github.com/lifepillar/vim-solarized8/,HEAD, https://github.com/tomlion/vim-solidity/,, https://github.com/christoomey/vim-sort-motion/,, https://github.com/tpope/vim-speeddating/,, From 8634641676c76bc7245ce1dd18d34b42035aea74 Mon Sep 17 00:00:00 2001 From: wzy <32936898+Freed-Wu@users.noreply.github.com> Date: Thu, 30 Mar 2023 16:34:55 +0800 Subject: [PATCH 176/182] trash-cli: add shell completions --- pkgs/tools/misc/trash-cli/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index f607da9099a0..fdc99fcfaa00 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -43,6 +43,16 @@ python3Packages.buildPythonApplication rec { runHook postInstallCheck ''; + postInstall = '' + for bin in trash{,-{empty,list,put,restore}}; do + $out/bin/$bin --print-completion bash > $bin + install -Dm644 $bin -t $out/share/bash-completion/completions + $out/bin/$bin --print-completion zsh > _$bin + install -Dm644 _$bin -t $out/share/zsh/site-functions + $out/bin/$bin --print-completion tcsh > $bin.csh + install -Dm644 $bin.csh -t $out/etc/profile.d + done + ''; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; From f7cb50b3cfd4c6c4be75f5e33172021be562a49b Mon Sep 17 00:00:00 2001 From: wzy <32936898+Freed-Wu@users.noreply.github.com> Date: Tue, 4 Apr 2023 04:15:12 +0800 Subject: [PATCH 177/182] trash-cli: use installShellCompletion --- pkgs/tools/misc/trash-cli/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index fdc99fcfaa00..48bb79467cd8 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, installShellFiles, python3Packages }: python3Packages.buildPythonApplication rec { pname = "trash-cli"; @@ -13,6 +13,11 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ psutil six ]; + nativeBuildInputs = with python3Packages; [ + installShellFiles + shtab + ]; + nativeCheckInputs = with python3Packages; [ mock pytestCheckHook @@ -44,13 +49,10 @@ python3Packages.buildPythonApplication rec { runHook postInstallCheck ''; postInstall = '' - for bin in trash{,-{empty,list,put,restore}}; do - $out/bin/$bin --print-completion bash > $bin - install -Dm644 $bin -t $out/share/bash-completion/completions - $out/bin/$bin --print-completion zsh > _$bin - install -Dm644 _$bin -t $out/share/zsh/site-functions - $out/bin/$bin --print-completion tcsh > $bin.csh - install -Dm644 $bin.csh -t $out/etc/profile.d + for bin in trash-empty trash-list trash-restore trash-put trash; do + installShellCompletion --cmd "$bin" \ + --bash <("$out/bin/$bin" --print-completion bash) \ + --zsh <("$out/bin/$bin" --print-completion zsh) done ''; From a7333e6b435e6ae8ca28af8cd6de863215d43846 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 11:19:01 +0000 Subject: [PATCH 178/182] tofi: unmark broken on aarch64 When the tofi package was added, it didn't build on aarch64, but now it does, presumably due to the GCC upgrade. --- pkgs/applications/misc/tofi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index ba2c2827b7da..9cd651cfcae3 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fbergroth ]; platforms = platforms.linux; - broken = stdenv.isAarch64; }; } From d7d3821ab83260e5b9d376b39fa139989c61c978 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 11:19:42 +0000 Subject: [PATCH 179/182] tofi: fix cross --- pkgs/applications/misc/tofi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 9cd651cfcae3..76c5b2047e30 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -6,6 +6,7 @@ , meson , scdoc , wayland-protocols +, wayland-scanner , freetype , harfbuzz , cairo @@ -25,7 +26,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90="; }; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ + meson ninja pkg-config scdoc wayland-protocols wayland-scanner + ]; buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ]; meta = with lib; { From c10a195ab1b577918fdfa1f4a08b7b634f137be9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 8 Apr 2023 12:55:40 -0600 Subject: [PATCH 180/182] gcc: tighten platform flags special-case for aarch64-darwin The 4aa95e33121c316c5b34031bb08106d2dc113e38 commit added support for aarch64-darwin but also ignored platform flags if the build platform is aarch64-darwin. This leads to confusing errors such as `pkgsCross.raspberryPi` packages compiled with soft-float even though the platform supports hard-float (and is built as such on other platforms). The correct way to ignore platform flags is to check `targetPlatform`, not the build platform. This change fixes that. While we're here, tigthen the special-case to cover only the problematic flags: `-with-cpu` and `-with-arch`. --- pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +-- pkgs/development/compilers/gcc/common/platform-flags.nix | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 771c16d84b7b..aa8ecc62e55a 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -217,8 +217,7 @@ let ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc - ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) + ++ import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; } ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional disableBootstrap' "--disable-bootstrap" diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index c0593cd781ed..57d7438fcd3a 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -1,12 +1,15 @@ { lib, targetPlatform }: let + isAarch64Darwin = targetPlatform.isDarwin && targetPlatform.isAarch64; gcc = targetPlatform.gcc or {}; p = gcc // targetPlatform.parsed.abi; in lib.concatLists [ - (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64 - (lib.optional (p ? cpu) "--with-cpu=${p.cpu}") + # --with-arch= is unknown flag on x86_64 and aarch64-darwin. + (lib.optional (!targetPlatform.isx86_64 && !isAarch64Darwin && p ? arch) "--with-arch=${p.arch}") + # --with-cpu on aarch64-darwin fails with "Unknown cpu used in --with-cpu=apple-a13". + (lib.optional (!isAarch64Darwin && p ? cpu) "--with-cpu=${p.cpu}") (lib.optional (p ? abi) "--with-abi=${p.abi}") (lib.optional (p ? fpu) "--with-fpu=${p.fpu}") (lib.optional (p ? float) "--with-float=${p.float}") From fbd71c4856cff61fe3fb1c82f13f1590f9069781 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Fri, 28 Apr 2023 08:13:15 +1000 Subject: [PATCH 181/182] dtrx: 8.5.0 -> 8.5.1 --- pkgs/tools/compression/dtrx/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 5a32db7c050e..074da03956dc 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -21,20 +21,15 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; rev = "refs/tags/${version}"; - sha256 = "sha256-jx2IHa7Ztg8Dbwgm8mSJQKtNpg0sg5axGssBMTAMDI0="; + sha256 = "sha256-KOHafmvl17IABlcBuE7isHVCIYRbA68Dna6rgiiWlkQ="; }; - # https://github.com/dtrx-py/dtrx/issues/45 - postPatch = '' - sed -i "s/platform==unsupported/# platform==unsupported/" setup.cfg - ''; - postInstall = let archivers = lib.makeBinPath ( From af661f3be7e995a3f7ae17e29938ceea80263c88 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 27 Apr 2023 18:36:02 -0400 Subject: [PATCH 182/182] Revert "root: fix build on aarch64-darwin" --- pkgs/applications/science/misc/root/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index c98c50273f47..2ebfd4a1a87a 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -208,9 +208,6 @@ stdenv.mkDerivation rec { # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found # fatal error: could not build module '_Builtin_intrinsics' "-Druntime_cxxmodules=OFF" - - # At least C++17 standard required with root7 - "-DCMAKE_CXX_STANDARD=17" ]; # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.