From 04851a974b7187070dd5c3aa858fc80788296a1d Mon Sep 17 00:00:00 2001 From: redyf Date: Fri, 26 Jul 2024 22:48:59 -0300 Subject: [PATCH 001/136] lilex: init at 2.530 --- pkgs/by-name/li/lilex/package.nix | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/li/lilex/package.nix diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix new file mode 100644 index 000000000000..1e7c316babe7 --- /dev/null +++ b/pkgs/by-name/li/lilex/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: +stdenvNoCC.mkDerivation rec { + pname = "lilex"; + version = "2.530"; + + src = fetchurl { + url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip"; + hash = "sha256-sBn8DaXj7OXHNaoEAhjTuMmUVUbS0zNZi1h7EjembEo="; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + runHook preUnpack + unzip $src + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source programming font"; + homepage = "https://github.com/mishamyrt/Lilex"; + license = licenses.ofl; + maintainers = with maintainers; [ redyf ]; + platforms = platforms.all; + }; +} From 0e88eabaaa1d7aaf655c0dbc85a08c8feba5e9eb Mon Sep 17 00:00:00 2001 From: eljamm Date: Wed, 31 Jul 2024 12:20:23 +0100 Subject: [PATCH 002/136] penguin-subtitle-player: init at 1.6.0 --- .../pe/penguin-subtitle-player/package.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/pe/penguin-subtitle-player/package.nix diff --git a/pkgs/by-name/pe/penguin-subtitle-player/package.nix b/pkgs/by-name/pe/penguin-subtitle-player/package.nix new file mode 100644 index 000000000000..d2eb9306fd20 --- /dev/null +++ b/pkgs/by-name/pe/penguin-subtitle-player/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + qt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "penguin-subtitle-player"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "carsonip"; + repo = "Penguin-Subtitle-Player"; + rev = "v${finalAttrs.version}"; + hash = "sha256-AhdShg/eWqF44W1r+KmcHzbGKF2TNSD/wPKj+x4oQkM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + buildInputs = [ qt5.qmake ]; + + meta = { + description = "Open-source, cross-platform and standalone subtitle player"; + homepage = "https://github.com/carsonip/Penguin-Subtitle-Player"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ eljamm ]; + platforms = lib.platforms.all; + mainProgram = "PenguinSubtitlePlayer"; + }; +}) From 06ce1d333091a55bcace79117e213ad995bf8153 Mon Sep 17 00:00:00 2001 From: David Cox Date: Sat, 9 Dec 2023 21:56:15 -1000 Subject: [PATCH 003/136] papilo: init at 2.3.0 --- pkgs/by-name/pa/papilo/package.nix | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/pa/papilo/package.nix diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix new file mode 100644 index 000000000000..2e9e6b348de1 --- /dev/null +++ b/pkgs/by-name/pa/papilo/package.nix @@ -0,0 +1,48 @@ +{ + blas, + boost, + cmake, + fetchFromGitHub, + gfortran12, + lib, + stdenv, + tbb, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "papilo"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "scipopt"; + repo = "papilo"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rB8kRyBxd+zn3XFueTQoN16jbFpXMvneqatQm8Hh2Hg="; + }; + + buildInputs = [ + blas + boost + cmake + gfortran12 + zlib + ]; + + nativeBuildInputs = [ cmake ]; + + propagatedBuildInputs = [ tbb ]; + + strictDeps = true; + + doCheck = true; + + meta = { + homepage = "https://scipopt.org/"; + description = "Parallel Presolve for Integer and Linear Optimization"; + license = with lib.licenses; [ lgpl3Plus ]; + mainProgram = "papilo"; + maintainers = with lib.maintainers; [ david-r-cox ]; + platforms = lib.platforms.unix; + }; +}) From 6e439af37504904a275deef651d5a7ee7cea09f5 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Tue, 22 Oct 2024 16:35:27 +0530 Subject: [PATCH 004/136] python3Packages.presenterm-export: init at 0.2.5 --- .../presenterm-export/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/presenterm-export/default.nix diff --git a/pkgs/development/python-modules/presenterm-export/default.nix b/pkgs/development/python-modules/presenterm-export/default.nix new file mode 100644 index 000000000000..1120b663acb2 --- /dev/null +++ b/pkgs/development/python-modules/presenterm-export/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + ansi2html, + libtmux, + weasyprint, + dataclass-wizard, +}: + +buildPythonPackage rec { + pname = "presenterm-export"; + version = "0.2.5"; + pyproject = true; + + src = fetchPypi { + pname = "presenterm_export"; + inherit version; + hash = "sha256-jof/0phASV/0bE0wNaio9PVCfIgm30EWzlLWxPMw8Rs="; + }; + + pythonRelaxDeps = true; + + disabled = pythonOlder "3.9"; + + build-system = [ + setuptools + ]; + + dependencies = [ + ansi2html + libtmux + weasyprint + dataclass-wizard + ]; + + pythonImportsCheck = [ "presenterm_export" ]; + + meta = with lib; { + description = "PDF exporter for presenterm"; + homepage = "https://github.com/mfontanini/presenterm-export"; + changelog = "https://github.com/mfontanini/presenterm-export/releases/tag/v${version}"; + license = licenses.bsd2; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d0c8f1966ac..eee7115c6257 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10826,6 +10826,8 @@ self: super: with self; { preshed = callPackage ../development/python-modules/preshed { }; + presenterm-export = callPackage ../development/python-modules/presenterm-export { }; + pretend = callPackage ../development/python-modules/pretend { }; pretty-errors = callPackage ../development/python-modules/pretty-errors { }; From bc93e48b3763afdb044615461e711481206cc8e5 Mon Sep 17 00:00:00 2001 From: George Macon Date: Thu, 1 Feb 2024 11:23:23 -0500 Subject: [PATCH 005/136] tcptrace: init at 6.6.7 --- pkgs/by-name/tc/tcptrace/fix-owners.patch | 16 +++++++ pkgs/by-name/tc/tcptrace/package.nix | 54 +++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/by-name/tc/tcptrace/fix-owners.patch create mode 100644 pkgs/by-name/tc/tcptrace/package.nix diff --git a/pkgs/by-name/tc/tcptrace/fix-owners.patch b/pkgs/by-name/tc/tcptrace/fix-owners.patch new file mode 100644 index 000000000000..1b725f05087a --- /dev/null +++ b/pkgs/by-name/tc/tcptrace/fix-owners.patch @@ -0,0 +1,16 @@ +Index: tcptrace-6.6.1/Makefile.in +=================================================================== +--- tcptrace-6.6.1.orig/Makefile.in +--- tcptrace-6.6.1/Makefile.in +@@ -286,9 +286,9 @@ + # just a quick installation rule + INSTALL = ./install-sh -c + install: tcptrace install-man +- $(INSTALL) -m 755 -o bin -g bin tcptrace ${BINDIR}/tcptrace ++ $(INSTALL) -m 755 tcptrace ${BINDIR}/tcptrace + install-man: +- $(INSTALL) -m 444 -o bin -g bin tcptrace.man $(MANDIR)/man1/tcptrace.1 ++ $(INSTALL) -m 444 tcptrace.man $(MANDIR)/man1/tcptrace.1 + + + diff --git a/pkgs/by-name/tc/tcptrace/package.nix b/pkgs/by-name/tc/tcptrace/package.nix new file mode 100644 index 000000000000..146b15e67368 --- /dev/null +++ b/pkgs/by-name/tc/tcptrace/package.nix @@ -0,0 +1,54 @@ +{ + stdenv, + fetchurl, + lib, + libpcap, +}: +stdenv.mkDerivation (final: { + name = "tcptrace"; + version = "6.6.7"; + + srcs = [ + (fetchurl { + # Home page was down on 2024-02-01, so use Debian mirror as fallback. + urls = [ + "http://www.tcptrace.org/download/tcptrace-${final.version}.tar.gz" + "mirror://debian/pool/main/t/tcptrace/tcptrace_${final.version}.orig.tar.gz" + ]; + hash = "sha256-YzgKQFGTPKCJeUdqnfxvlZMIvJ9g1FJVIC44jrVpEL0="; + }) + (fetchurl { + url = "mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz"; + hash = "sha256-8rkwzdXcDOc3kACvrlyTQsnSw6AJgy6xA0YrECu63gY="; + }) + ]; + sourceRoot = "tcptrace-${final.version}"; + + outputs = [ + "out" + "man" + ]; + + setOutputFlags = false; + + patches = [ ./fix-owners.patch ]; + prePatch = '' + patches_deb=(../debian/patches/bug*) + patches+=" ''${patches_deb[*]}" + ''; + + buildInputs = [ libpcap ]; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "man"}/share/man" + ]; + + meta = { + description = "Tool for analysis of TCP dump files"; + homepage = "http://www.tcptrace.org/"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.gmacon ]; + mainProgram = "tcptrace"; + platforms = lib.platforms.unix; + }; +}) From 89af2f738d961ad2fc1a1fea11c78c04b7f3a7ee Mon Sep 17 00:00:00 2001 From: Vlad Petrov Date: Sun, 10 Nov 2024 14:17:54 +0300 Subject: [PATCH 006/136] nordzy-cursor-theme: 0.6.0 -> 2.3.0 Brings: - hyprcursor support - catppuccin theme - lefthand variation of every theme --- pkgs/by-name/no/nordzy-cursor-theme/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/no/nordzy-cursor-theme/package.nix b/pkgs/by-name/no/nordzy-cursor-theme/package.nix index 394626cec337..b4b93337d60b 100644 --- a/pkgs/by-name/no/nordzy-cursor-theme/package.nix +++ b/pkgs/by-name/no/nordzy-cursor-theme/package.nix @@ -5,23 +5,24 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; - version = "0.6.0"; + version = "2.3.0"; src = fetchFromGitHub { - owner = "alvatip"; + owner = "guillaumeboehm"; repo = "Nordzy-cursors"; rev = "v${version}"; - sha256 = "sha256-q9PEEyxejRQ8UCwbqsfOCL7M70pLCOLyCx8gEFmZkWA="; + sha256 = "sha256-3HUSl0CQcay4V9pO35cmOEZvrgNOJ3WNZahs+hJjUJU="; }; installPhase = '' mkdir -p $out/share/icons - cp -r Nordzy-cursors{,-white,-lefthand} $out/share/icons + cp -r xcursors/* $out/share/icons + cp -r hyprcursors/themes/* $out/share/icons ''; meta = with lib; { description = "Cursor theme using the Nord color palette and based on Vimix and cz-Viator"; - homepage = "https://github.com/alvatip/Nordzy-cursors"; + homepage = "https://github.com/guillaumeboehm/Nordzy-cursors"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ From e1677d068f1cfa218968e1c9c542afd8539df7a6 Mon Sep 17 00:00:00 2001 From: Mathias Sven Date: Wed, 22 Nov 2023 09:23:55 +0000 Subject: [PATCH 007/136] awk-language-server: init at 0.10.6 --- .../aw/awk-language-server/package.json | 59 + .../aw/awk-language-server/package.nix | 67 + pkgs/by-name/aw/awk-language-server/update.sh | 30 + pkgs/by-name/aw/awk-language-server/yarn.lock | 2762 +++++++++++++++++ 4 files changed, 2918 insertions(+) create mode 100644 pkgs/by-name/aw/awk-language-server/package.json create mode 100644 pkgs/by-name/aw/awk-language-server/package.nix create mode 100755 pkgs/by-name/aw/awk-language-server/update.sh create mode 100644 pkgs/by-name/aw/awk-language-server/yarn.lock diff --git a/pkgs/by-name/aw/awk-language-server/package.json b/pkgs/by-name/aw/awk-language-server/package.json new file mode 100644 index 000000000000..9437a5e76c74 --- /dev/null +++ b/pkgs/by-name/aw/awk-language-server/package.json @@ -0,0 +1,59 @@ +{ + "name": "awk-language-server", + "description": "AWK Language Server", + "version": "0.10.6", + "author": "Stanislav Chernov ", + "publisher": "beaglefoot", + "license": "MIT", + "keywords": [ + "language-server", + "language-server-protocol", + "lsp", + "awk", + "gawk" + ], + "engines": { + "node": ">=16.0.0" + }, + "bin": "./server/out/cli.js", + "main": "./server/out/server.js", + "typings": "./server/out/server.d.ts", + "repository": { + "type": "git", + "url": "https://github.com/Beaglefoot/awk-language-server" + }, + "dependencies": { + "minimist": "1.2.6", + "tree-sitter-awk": "0.7.2", + "vscode-languageserver": "^7.0.0", + "vscode-languageserver-textdocument": "^1.0.1", + "web-tree-sitter": "0.22.1" + }, + "devDependencies": { + "@types/minimist": "1.2.2", + "@types/jest": "27.0.1", + "@types/node": "^12.12.0", + "jest": "27.1.1", + "prettier": "2.3.2", + "ts-jest": "27.0.5", + "typescript": "^4.3.2" + }, + "scripts": { + "build:completion": "man gawk | gawk -f scripts/build_completion_list.awk > docs.json", + "prepublishOnly": "cd .. && yarn build:server:force", + "clean:client": "rm -rfv client/out/*", + "clean:server": "rm -rfv server/out/*", + "build": "yarn build:server && yarn build:client", + "build:client": "tsc -b client/tsconfig.json", + "build:client:force": "yarn clean:client && yarn build:client --verbose --force", + "build:server": "tsc -b server/tsconfig.json", + "build:server:force": "yarn clean:server && yarn build:server --verbose --force", + "postinstall": "cd client && yarn && cd ../server && yarn && cd ..", + "test": "jest", + "test:server": "jest server/tests", + "test:ci": "jest --runInBand", + "check:types": "tsc --noEmit -p server/tsconfig.json", + "check:style": "prettier --check **/*.ts" + }, + "private": true +} diff --git a/pkgs/by-name/aw/awk-language-server/package.nix b/pkgs/by-name/aw/awk-language-server/package.nix new file mode 100644 index 000000000000..4207a2394013 --- /dev/null +++ b/pkgs/by-name/aw/awk-language-server/package.nix @@ -0,0 +1,67 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + jq, +}: + +mkYarnPackage rec { + name = "awk-language-server"; + version = "0.10.6"; + + src = fetchFromGitHub { + owner = "Beaglefoot"; + repo = "awk-language-server"; + rev = "server-${version}"; + hash = "sha256-YtduDfMAUAoQY9tgyhgERFwx9TEgD52KdeHnX2MrjjI="; + sparseCheckout = [ "server" ]; + postFetch = '' + # combine both yarn lock files + tail -n+4 $out/server/yarn.lock >> $out/yarn.lock + + # recontextualize server/package.json to be one folder up + sed -i 's|\./|./server/|' $out/server/package.json + + # combine both package.json files + ${lib.getExe jq} -s '.[0] * .[1]' \ + $out/server/package.json \ + $out/package.json \ + > package.json + mv -f package.json $out/ + ''; + }; + + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + + offlineCache = fetchYarnDeps { + yarnLock = ./yarn.lock; + hash = "sha256-PaebqpXQGBxqcaxun8zi6TPeIgHmY+2fjsE/3LaWPN8="; + }; + + distPhase = "true"; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn --offline build:server + + runHook postBuild + ''; + + postInstall = '' + chmod +x $out/bin/awk-language-server + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "Language Server for AWK and associated VSCode client extension"; + homepage = "https://github.com/Beaglefoot/awk-language-server"; + license = licenses.mit; + maintainers = with maintainers; [ mathiassven ]; + mainProgram = "awk-language-server"; + }; +} diff --git a/pkgs/by-name/aw/awk-language-server/update.sh b/pkgs/by-name/aw/awk-language-server/update.sh new file mode 100755 index 000000000000..7009197794a5 --- /dev/null +++ b/pkgs/by-name/aw/awk-language-server/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gnused prefetch-yarn-deps + +set -e + +# update src version and hash +version="$(list-git-tags | sort -V | tail -1 | sed 's|server-||')" + +update-source-version awk-language-server "$version" + +# update vendored yarn.lock & package.json +newSrc="$(nix-build --no-out-link -A awk-language-server.src)" + +nixFile="$(nix-instantiate --eval --strict -A 'awk-language-server.meta.position' \ + | sed -re 's/^"(.*):[0-9]+"$/\1/')" + +nixFileDir="$(dirname "$nixFile")" + +cp --force --no-preserve=mode "$newSrc"/{yarn.lock,package.json} "$nixFileDir/" + +# update offlineCache hash +oldCacheSriHash="$(nix-instantiate --eval --strict \ + -A 'awk-language-server.offlineCache.drvAttrs.outputHash')" + +newCacheHash="$(prefetch-yarn-deps "$nixFileDir/yarn.lock")" + +newCacheSriHash="$(nix-hash --to-sri --type sha256 "$newCacheHash")" + +sed -i "s|$oldCacheSriHash|\"$newCacheSriHash\"|" "$nixFile" + diff --git a/pkgs/by-name/aw/awk-language-server/yarn.lock b/pkgs/by-name/aw/awk-language-server/yarn.lock new file mode 100644 index 000000000000..24487cd37741 --- /dev/null +++ b/pkgs/by-name/aw/awk-language-server/yarn.lock @@ -0,0 +1,2762 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + +"@babel/compat-data@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" + integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== + +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.10.tgz#74ef0fbf56b7dfc3f198fc2d927f4f03e12f4b05" + integrity sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.10" + "@babel/helper-compilation-targets" "^7.17.10" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.9" + "@babel/parser" "^7.17.10" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.10" + "@babel/types" "^7.17.10" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.1" + semver "^6.3.0" + +"@babel/generator@^7.17.10", "@babel/generator@^7.7.2": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" + integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== + dependencies: + "@babel/types" "^7.17.10" + "@jridgewell/gen-mapping" "^0.1.0" + jsesc "^2.5.1" + +"@babel/generator@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== + dependencies: + "@babel/types" "^7.23.0" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + +"@babel/helper-compilation-targets@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe" + integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.20.2" + semver "^6.3.0" + +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-module-transforms@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" + integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== + dependencies: + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + +"@babel/helper-simple-access@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== + dependencies: + "@babel/types" "^7.17.0" + +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== + dependencies: + "@babel/types" "^7.16.7" + +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== + +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== + +"@babel/helpers@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" + integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== + dependencies: + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.9" + "@babel/types" "^7.17.0" + +"@babel/highlight@^7.16.7": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" + integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" + integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== + +"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== + dependencies: + "@babel/helper-plugin-utils" "^7.12.13" + +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-typescript@^7.7.2": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" + integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== + dependencies: + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/template@^7.16.7", "@babel/template@^7.3.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" + +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2": + version "7.23.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8" + integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.23.0" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.0" + "@babel/types" "^7.23.0" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" + integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" + integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== + +"@jest/console@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" + integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== + dependencies: + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^27.5.1" + jest-util "^27.5.1" + slash "^3.0.0" + +"@jest/core@^27.1.1", "@jest/core@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" + integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== + dependencies: + "@jest/console" "^27.5.1" + "@jest/reporters" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + emittery "^0.8.1" + exit "^0.1.2" + graceful-fs "^4.2.9" + jest-changed-files "^27.5.1" + jest-config "^27.5.1" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-resolve-dependencies "^27.5.1" + jest-runner "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" + jest-watcher "^27.5.1" + micromatch "^4.0.4" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" + integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== + dependencies: + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + jest-mock "^27.5.1" + +"@jest/fake-timers@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" + integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== + dependencies: + "@jest/types" "^27.5.1" + "@sinonjs/fake-timers" "^8.0.1" + "@types/node" "*" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-util "^27.5.1" + +"@jest/globals@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" + integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/types" "^27.5.1" + expect "^27.5.1" + +"@jest/reporters@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" + integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.9" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^5.1.0" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.1.3" + jest-haste-map "^27.5.1" + jest-resolve "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^8.1.0" + +"@jest/source-map@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" + integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.9" + source-map "^0.6.0" + +"@jest/test-result@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" + integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== + dependencies: + "@jest/console" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" + integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== + dependencies: + "@jest/test-result" "^27.5.1" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-runtime "^27.5.1" + +"@jest/transform@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" + integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^27.5.1" + babel-plugin-istanbul "^6.1.1" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-regex-util "^27.5.1" + jest-util "^27.5.1" + micromatch "^4.0.4" + pirates "^4.0.4" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" + integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^16.0.0" + chalk "^4.0.0" + +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== + +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@jridgewell/sourcemap-codec@^1.4.14": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + +"@jridgewell/trace-mapping@^0.3.17": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" + integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.11" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz#eb2e124521f27673493030d02dffedf60e56553f" + integrity sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@sinonjs/commons@^1.7.0": + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^8.0.1": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" + integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": + version "7.1.19" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.4" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": + version "7.17.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.1.tgz#1a0e73e8c28c7e832656db372b779bfd2ef37314" + integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA== + dependencies: + "@babel/types" "^7.3.0" + +"@types/graceful-fs@^4.1.2": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" + integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + dependencies: + "@types/node" "*" + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/jest@27.0.1": + version "27.0.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.1.tgz#fafcc997da0135865311bb1215ba16dba6bdf4ca" + integrity sha512-HTLpVXHrY69556ozYkcq47TtQJXpcWAWfkoqz+ZGz2JnmZhzlRjprCIyFnetSy8gpDWwTTGBcRVv1J1I1vBrHw== + dependencies: + jest-diff "^27.0.0" + pretty-format "^27.0.0" + +"@types/node@*": + version "17.0.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d" + integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q== + +"@types/node@^12.12.0": + version "12.20.50" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.50.tgz#14ba5198f1754ffd0472a2f84ab433b45ee0b65e" + integrity sha512-+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA== + +"@types/prettier@^2.1.5": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" + integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== + +"@types/stack-utils@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== + +"@types/yargs-parser@*": + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== + +"@types/yargs@^16.0.0": + version "16.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== + dependencies: + "@types/yargs-parser" "*" + +abab@^2.0.3, abab@^2.0.5: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +acorn@^8.2.4: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ansi-escapes@^4.2.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +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" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + +anymatch@^3.0.3: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +babel-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" + integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== + dependencies: + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/babel__core" "^7.1.14" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^27.5.1" + chalk "^4.0.0" + graceful-fs "^4.2.9" + slash "^3.0.0" + +babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^5.0.4" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" + integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-preset-current-node-syntax@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" + integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" + integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== + dependencies: + babel-plugin-jest-hoist "^27.5.1" + babel-preset-current-node-syntax "^1.0.0" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +browserslist@^4.20.2: + version "4.20.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" + integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== + dependencies: + caniuse-lite "^1.0.30001332" + electron-to-chromium "^1.4.118" + escalade "^3.1.1" + node-releases "^2.0.3" + picocolors "^1.0.0" + +bs-logger@0.x: + version "0.2.6" + resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" + integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== + dependencies: + fast-json-stable-stringify "2.x" + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +caniuse-lite@^1.0.30001332: + version "1.0.30001339" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001339.tgz#f9aece4ea8156071613b27791547ba0b33f176cf" + integrity sha512-Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ== + +chalk@^2.0.0, chalk@^2.4.2: + 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: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + +cjs-module-lexer@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + +color-convert@^1.9.0: + 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== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + +cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + +debug@4, debug@^4.1.0, debug@^4.1.1: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + +dedent@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= + +deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + +diff-sequences@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" + integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + +electron-to-chromium@^1.4.118: + version "1.4.137" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" + integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== + +emittery@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" + integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +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" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-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 sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + +expect@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" + integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== + dependencies: + "@jest/types" "^27.5.1" + jest-get-type "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@^4.0.0, find-up@^4.1.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" + +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +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-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + +https-proxy-agent@^5.0.0: + 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== + dependencies: + agent-base "6" + debug "4" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +import-local@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-core-module@^2.8.1: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== + dependencies: + has "^1.0.3" + +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" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== + +istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f" + integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A== + dependencies: + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.2.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + +jest-changed-files@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" + integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== + dependencies: + "@jest/types" "^27.5.1" + execa "^5.0.0" + throat "^6.0.1" + +jest-circus@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" + integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + dedent "^0.7.0" + expect "^27.5.1" + is-generator-fn "^2.0.0" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" + slash "^3.0.0" + stack-utils "^2.0.3" + throat "^6.0.1" + +jest-cli@^27.1.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" + integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== + dependencies: + "@jest/core" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.9" + import-local "^3.0.2" + jest-config "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" + prompts "^2.0.1" + yargs "^16.2.0" + +jest-config@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" + integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== + dependencies: + "@babel/core" "^7.8.0" + "@jest/test-sequencer" "^27.5.1" + "@jest/types" "^27.5.1" + babel-jest "^27.5.1" + chalk "^4.0.0" + ci-info "^3.2.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.9" + jest-circus "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-get-type "^27.5.1" + jest-jasmine2 "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runner "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" + micromatch "^4.0.4" + parse-json "^5.2.0" + pretty-format "^27.5.1" + slash "^3.0.0" + strip-json-comments "^3.1.1" + +jest-diff@^27.0.0, jest-diff@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" + integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== + dependencies: + chalk "^4.0.0" + diff-sequences "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" + +jest-docblock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" + integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== + dependencies: + detect-newline "^3.0.0" + +jest-each@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" + integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== + dependencies: + "@jest/types" "^27.5.1" + chalk "^4.0.0" + jest-get-type "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" + +jest-environment-jsdom@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" + integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + jest-mock "^27.5.1" + jest-util "^27.5.1" + jsdom "^16.6.0" + +jest-environment-node@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" + integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + jest-mock "^27.5.1" + jest-util "^27.5.1" + +jest-get-type@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" + integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== + +jest-haste-map@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" + integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== + dependencies: + "@jest/types" "^27.5.1" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.9" + jest-regex-util "^27.5.1" + jest-serializer "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" + micromatch "^4.0.4" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.3.2" + +jest-jasmine2@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" + integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^27.5.1" + is-generator-fn "^2.0.0" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" + throat "^6.0.1" + +jest-leak-detector@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" + integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== + dependencies: + jest-get-type "^27.5.1" + pretty-format "^27.5.1" + +jest-matcher-utils@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" + integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== + dependencies: + chalk "^4.0.0" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" + +jest-message-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" + integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^27.5.1" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^27.5.1" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" + integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== + dependencies: + "@jest/types" "^27.5.1" + "@types/node" "*" + +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" + integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== + +jest-resolve-dependencies@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" + integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== + dependencies: + "@jest/types" "^27.5.1" + jest-regex-util "^27.5.1" + jest-snapshot "^27.5.1" + +jest-resolve@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" + integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== + dependencies: + "@jest/types" "^27.5.1" + chalk "^4.0.0" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-pnp-resolver "^1.2.2" + jest-util "^27.5.1" + jest-validate "^27.5.1" + resolve "^1.20.0" + resolve.exports "^1.1.0" + slash "^3.0.0" + +jest-runner@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" + integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== + dependencies: + "@jest/console" "^27.5.1" + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.8.1" + graceful-fs "^4.2.9" + jest-docblock "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-haste-map "^27.5.1" + jest-leak-detector "^27.5.1" + jest-message-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runtime "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" + source-map-support "^0.5.6" + throat "^6.0.1" + +jest-runtime@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" + integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== + dependencies: + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/globals" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + chalk "^4.0.0" + cjs-module-lexer "^1.0.0" + collect-v8-coverage "^1.0.0" + execa "^5.0.0" + glob "^7.1.3" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + slash "^3.0.0" + strip-bom "^4.0.0" + +jest-serializer@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" + integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.9" + +jest-snapshot@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" + integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== + dependencies: + "@babel/core" "^7.7.2" + "@babel/generator" "^7.7.2" + "@babel/plugin-syntax-typescript" "^7.7.2" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.0.0" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.1.5" + babel-preset-current-node-syntax "^1.0.0" + chalk "^4.0.0" + expect "^27.5.1" + graceful-fs "^4.2.9" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + jest-haste-map "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-util "^27.5.1" + natural-compare "^1.4.0" + pretty-format "^27.5.1" + semver "^7.3.2" + +jest-util@^27.0.0, jest-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" + integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== + dependencies: + "@jest/types" "^27.5.1" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" + integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== + dependencies: + "@jest/types" "^27.5.1" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^27.5.1" + leven "^3.1.0" + pretty-format "^27.5.1" + +jest-watcher@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" + integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== + dependencies: + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^27.5.1" + string-length "^4.0.1" + +jest-worker@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@27.1.1: + version "27.1.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.1.1.tgz#49f0497fa0fb07dc78898318cc1b737b5fbf72d8" + integrity sha512-LFTEZOhoZNR/2DQM3OCaK5xC6c55c1OWhYh0njRsoHX0qd6x4nkcgenkSH0JKjsAGMTmmJAoL7/oqYHMfwhruA== + dependencies: + "@jest/core" "^27.1.1" + import-local "^3.0.2" + jest-cli "^27.1.1" + +js-tokens@^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== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsdom@^16.6.0: + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== + dependencies: + abab "^2.0.5" + acorn "^8.2.4" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.3.0" + data-urls "^2.0.0" + decimal.js "^10.2.1" + domexception "^2.0.1" + escodegen "^2.0.0" + form-data "^3.0.0" + html-encoding-sniffer "^2.0.1" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.0" + parse5 "6.0.1" + saxes "^5.0.1" + symbol-tree "^3.2.4" + tough-cookie "^4.0.0" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.5.0" + ws "^7.4.6" + xml-name-validator "^3.0.0" + +jsesc@^2.5.1: + version "2.5.2" + 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== + +json5@2.x, json5@^2.2.1: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +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== + +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" + +lodash@4.x, lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-error@1.x: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== + dependencies: + tmpl "1.0.5" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + +node-releases@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476" + integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ== + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +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-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-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== + +parse-json@^5.2.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== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pirates@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== + +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" + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prettier@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== + +pretty-format@^27.0.0, pretty-format@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== + dependencies: + ansi-regex "^5.0.1" + ansi-styles "^5.0.0" + react-is "^17.0.1" + +prompts@^2.0.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + +psl@^1.1.33: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve.exports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + +resolve@^1.20.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + dependencies: + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +saxes@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + +semver@7.x, semver@^7.3.2: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + +semver@^6.0.0, semver@^6.3.0: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.2, signal-exit@^3.0.3: + 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== + +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +source-map-support@^0.5.6: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +stack-utils@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== + dependencies: + escape-string-regexp "^2.0.0" + +string-length@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.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== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +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" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +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== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + +throat@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" + integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== + +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tough-cookie@^4.0.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== + dependencies: + punycode "^2.1.1" + +ts-jest@27.0.5: + version "27.0.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.5.tgz#0b0604e2271167ec43c12a69770f0bb65ad1b750" + integrity sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w== + dependencies: + bs-logger "0.x" + fast-json-stable-stringify "2.x" + jest-util "^27.0.0" + json5 "2.x" + lodash "4.x" + make-error "1.x" + semver "7.x" + yargs-parser "20.x" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typescript@^4.3.2: + version "4.6.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" + integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== + +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +v8-to-istanbul@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" + integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walker@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== + dependencies: + makeerror "1.0.12" + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== + dependencies: + lodash "^4.7.0" + tr46 "^2.1.0" + webidl-conversions "^6.1.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +word-wrap@~1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f" + integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^7.4.6: + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@20.x, yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +"@types/minimist@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + +minimist@1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + +node-addon-api@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb" + integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g== + +node-gyp-build@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.0.tgz#3fee9c1731df4581a3f9ead74664369ff00d26dd" + integrity sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og== + +tree-sitter-awk@0.7.2: + version "0.7.2" + resolved "https://registry.yarnpkg.com/tree-sitter-awk/-/tree-sitter-awk-0.7.2.tgz#f8991fd4aae20938c9e86e24ee727fa73216cdca" + integrity sha512-Y9qGrM9a/AkeglOMSYzM0Tek5rox9WZmlV1/l3wyBJaMdpeMGsC3z4Jn+OvuevJO78gtmW1SuXfCva1f4veuTg== + dependencies: + node-addon-api "^7.1.0" + node-gyp-build "^4.8.0" + +vscode-jsonrpc@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e" + integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg== + +vscode-languageserver-protocol@3.16.0: + version "3.16.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821" + integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A== + dependencies: + vscode-jsonrpc "6.0.0" + vscode-languageserver-types "3.16.0" + +vscode-languageserver-textdocument@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f" + integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA== + +vscode-languageserver-types@3.16.0: + version "3.16.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" + integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== + +vscode-languageserver@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0" + integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw== + dependencies: + vscode-languageserver-protocol "3.16.0" + +web-tree-sitter@0.22.1: + version "0.22.1" + resolved "https://registry.yarnpkg.com/web-tree-sitter/-/web-tree-sitter-0.22.1.tgz#4b5243b082e85bd6ab5c0c56d1f826df29d8b9ed" + integrity sha512-3wfVqI6KredBmIo8Z1kycbcUIhPLzvqvuD1Y2GA6eRjYJOCypqy7Pv4P0Dm0JToi/oloBwvXfr7+7p42DgbC4Q== From 99bc8179e8fe2aa369d0d9a1965f57220eeaa533 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Thu, 23 May 2024 09:33:16 +0200 Subject: [PATCH 008/136] hexapdf: init at 1.0.2 --- pkgs/by-name/he/hexapdf/Gemfile | 2 ++ pkgs/by-name/he/hexapdf/Gemfile.lock | 19 +++++++++++ pkgs/by-name/he/hexapdf/gemset.nix | 47 ++++++++++++++++++++++++++++ pkgs/by-name/he/hexapdf/package.nix | 26 +++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 pkgs/by-name/he/hexapdf/Gemfile create mode 100644 pkgs/by-name/he/hexapdf/Gemfile.lock create mode 100644 pkgs/by-name/he/hexapdf/gemset.nix create mode 100644 pkgs/by-name/he/hexapdf/package.nix diff --git a/pkgs/by-name/he/hexapdf/Gemfile b/pkgs/by-name/he/hexapdf/Gemfile new file mode 100644 index 000000000000..93fe791ba3a3 --- /dev/null +++ b/pkgs/by-name/he/hexapdf/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'hexapdf' diff --git a/pkgs/by-name/he/hexapdf/Gemfile.lock b/pkgs/by-name/he/hexapdf/Gemfile.lock new file mode 100644 index 000000000000..d5e52669afc8 --- /dev/null +++ b/pkgs/by-name/he/hexapdf/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cmdparse (3.0.7) + geom2d (0.4.1) + hexapdf (1.0.2) + cmdparse (~> 3.0, >= 3.0.3) + geom2d (~> 0.4, >= 0.4.1) + openssl (>= 2.2.1) + openssl (3.2.0) + +PLATFORMS + ruby + +DEPENDENCIES + hexapdf + +BUNDLED WITH + 2.5.9 diff --git a/pkgs/by-name/he/hexapdf/gemset.nix b/pkgs/by-name/he/hexapdf/gemset.nix new file mode 100644 index 000000000000..257151ff854a --- /dev/null +++ b/pkgs/by-name/he/hexapdf/gemset.nix @@ -0,0 +1,47 @@ +{ + cmdparse = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f87jny4zk21iyrkyyw4kpnq8ymrwjay02ipagwapimy237cmigp"; + type = "gem"; + }; + version = "3.0.7"; + }; + geom2d = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nafcfznjqycxd062cais64ydgl99xddh4zy4hp7bwn4j3m9h2ga"; + type = "gem"; + }; + version = "0.4.1"; + }; + hexapdf = { + dependencies = [ + "cmdparse" + "geom2d" + "openssl" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13dbscnf7c3jlghlkgl01b7hzgx2ps26m57qmhyv5g626n342i4c"; + type = "gem"; + }; + version = "1.0.2"; + }; + openssl = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw"; + type = "gem"; + }; + version = "3.2.0"; + }; +} diff --git a/pkgs/by-name/he/hexapdf/package.nix b/pkgs/by-name/he/hexapdf/package.nix new file mode 100644 index 000000000000..01fb51b09854 --- /dev/null +++ b/pkgs/by-name/he/hexapdf/package.nix @@ -0,0 +1,26 @@ +{ + lib, + bundlerApp, + bundlerUpdateScript, + ruby, +}: + +bundlerApp { + pname = "hexapdf"; + exes = [ "hexapdf" ]; + + inherit ruby; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "hexapdf"; + + meta = with lib; { + description = "Versatile PDF creation and manipulation library"; + homepage = "https://hexapdf.gettalong.org/"; + changelog = "https://github.com/gettalong/hexapdf/blob/master/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ bbenno ]; + platforms = platforms.unix; + mainProgram = "hexapdf"; + }; +} From 9ffec75b334e4b5dfaf028678a517dfd7fc55cb0 Mon Sep 17 00:00:00 2001 From: fin444 Date: Sat, 21 Sep 2024 11:31:38 -0400 Subject: [PATCH 009/136] logisim-evolution: 3.8.0 -> 3.9.0 --- pkgs/by-name/lo/logisim-evolution/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/logisim-evolution/package.nix b/pkgs/by-name/lo/logisim-evolution/package.nix index 465360a20238..25127d879e4f 100644 --- a/pkgs/by-name/lo/logisim-evolution/package.nix +++ b/pkgs/by-name/lo/logisim-evolution/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "logisim-evolution"; - version = "3.8.0"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar"; - hash = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; + hash = "sha256-QxU1h6LKzWy25wtXgEufPT0KsIsLhrKnq9CRcS4Mlzc="; }; dontUnpack = true; From 58542c2d7eee26541aba35745e2eec40a0ee22b6 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Tue, 12 Nov 2024 09:49:00 -0500 Subject: [PATCH 010/136] descent3-unwrapped: init at 1.5.0-beta-unstable-2024-10-29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally, I had thought that the version number should be 1.5.0-unstable-2024-10-29. It ended up being 1.5.0-beta-unstable-2024-10-29 due to a technicality. The package versioning conventions in pkgs/README.md say: > - If a package is a commit from a repository without a version > assigned, then the `version` attribute _should_ be the latest upstream > version preceding that commit, followed by `-unstable-` and the date > of the (fetched) commit. The key phrase here is “preceding that commit”. The commit for Descent 3 version 1.5.0 was created in a separate branch [1]. That being said, there was a beta version of 1.5.0 that was released in 2005 [2]. That beta version of 1.5.0 was indeed merged into Descent 3’s main branch [3], so it’s the latest upstream version preceding the fetched commit. [1]: [2]: [3]: --- .../by-name/de/descent3-unwrapped/package.nix | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 pkgs/by-name/de/descent3-unwrapped/package.nix diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix new file mode 100644 index 000000000000..eb1d0de47adb --- /dev/null +++ b/pkgs/by-name/de/descent3-unwrapped/package.nix @@ -0,0 +1,152 @@ +{ + SDL2, + cmake, + fetchFromGitHub, + glm, + lib, + runCommand, + stdenv, + unstableGitUpdater, + writeShellScript, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "descent3-unwrapped"; + # I’m using an unstable version here because we need to use -additionaldir in + # the wrapped version of Descent 3. Once there’s a stable version of Descent + # 3 that supports the -additionaldir command-line option, we can stop using + # an unstable version of Descent 3. + version = "1.5.0-beta-unstable-2024-10-29"; + src = fetchFromGitHub { + owner = "DescentDevelopers"; + repo = "Descent3"; + rev = "d51ce964c7a925333ea64f00cf8d9ae15ee63a6b"; + fetchSubmodules = true; + leaveDotGit = true; + # Descent 3 is supposed to display its Git commit hash in the bottom right + # corner of the main menu. That feature only works if either the .git + # directory or a git-hash.txt file exists at build time. We don’t want .git + # to exist at build time (see #8567), so we create a git-hash.txt file and + # then delete the .git directory. + # + # Technically, we could simplify the code by reading the value of src.rev. + # src.rev contains a Git commit hash at the moment, but it won’t contain a + # Git commit hash in the future when we switch to a stable version of + # Descent 3. + # + # Upstream expects git-hash.txt to contain a short commit hash, but I’ve + # decided to use a full commit hash. Full commit hashes are more + # reproducible. The short hash “1234” might correspond to one commit today, + # but correspond to two commits tomorrow. Full commit hashes don’t have + # that problem. + # + # Also, upstream expects git-hash.txt to contain no newlines. If + # git-hash.txt contains a newline, then Descent 3 will fail to build. + postFetch = '' + cd "$out" + git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt + rm -r .git + ''; + hash = "sha256-C6r06cntQ14jPFO9EUzLisZjsl22cIaJb8I7xFzXrNc="; + }; + + hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ + SDL2 + glm + zlib + ]; + cmakeFlags = [ "-DFORCE_PORTABLE_INSTALL=OFF" ]; + # This is a workaround for a problem that will eventually get fixed upstream. + postInstall = '' + cd "$out" + mv lib/* share/ + rmdir lib + ''; + + passthru = { + # The idea here is to make sure that we don’t forget to update meta.license + # when reviewing a pull request from @r-ryantm. + tests.licenseInfoIsUpToDate = runCommand "${pname}-license-info-is-up-to-date" { } '' + function on_success { + echo Test succeeded. > "$out" + } + + function on_failure { + echo \ + It looks like at least one of Descent 3’s licensing-related files \ + changed. Before you continue to update this package, you should \ + check to see if meta.license needs to be updated. Once you’ve done \ + that, you can update the hashes in the \ + passthru.tests.licenseInfoIsUpToDate script and then try running the \ + package tests again. >&2 + return 1 + } + + cd ${lib.strings.escapeShellArg src} + sha256sum --check << EOF && on_success || on_failure + 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b LICENSE + 55d65dbf5d785111cf7029941cb7f72dbef084509e6126bcc58b6bb20203f8c6 THIRD_PARTY.md + EOF + ''; + updateScript = unstableGitUpdater { + shallowClone = false; + # unstableGitUpdater assumes that the version number should be 0 if there + # isn’t any tags in the repo’s default branch. For most packages, that is + # the correct decision, but for Descent 3 it’s not. Descent 3’s source + # code lived in private repos until 2024. In 2024, a new public repo was + # created [1], but the old commit history wasn’t imported into the new + # repo. Version 1.5.0-beta from 2005 [2] was the last release that was + # created from one of the private repos.* + # + # *Technically, there was one release that came after the 2005 one. There + # was a Linux version and a macOS version of Descent 3 that were released + # on Steam in 2020 [3][4][5]. Those versions don’t count because they + # haven’t been fully merged into the public repo yet [6]. + # + # [1]: + # [2]: + # [3]: + # [4]: + # [5]: + # [6]: + tagConverter = writeShellScript "${pname}-tag-converter.sh" '' + read -r input_tag + if [ "$input_tag" = 0 ] + then + printf '%s' 1.5.0-beta + else + printf '%s' "$input_tag" + fi + ''; + }; + }; + + meta = { + description = "Game engine for a 6DOF first-person shooter"; + homepage = "https://github.com/DescentDevelopers/Descent3"; + license = with lib.licenses; [ + # See LICENSE and header that’s at the top of many source files. + gpl3Plus + # See THIRD_PARTY.md. + isc + mit + ]; + mainProgram = "Descent3"; + maintainers = [ lib.maintainers.jayman2000 ]; + platforms = lib.platforms.all; + badPlatforms = [ + # Descent 3 stores modules in HOG2 archives. It extracts those modules + # and then tries to dlopen() them at runtime. + lib.systems.inspect.platformPatterns.isStatic + # When you build Descent 3 on Darwin, it produces a different directory + # structure (no bin/ directory) [1]. I’m sure that this derivation could be + # updated to account for that different directory structure, but I don’t + # have any Darwin systems to test things on at the moment. + # + # [1]: + ] ++ lib.platforms.darwin; + }; +} From 4c5768f0bcafe2975cbe4fa7c6c65c559018a54f Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Tue, 12 Nov 2024 16:05:53 -0500 Subject: [PATCH 011/136] descent3: init at 1.5.0-beta-unstable-2024-10-29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By default, Descent 3 will only look for game files in the current working directory. In order to function properly, Descent 3 needs to look for some of its files in the Nix store. This commit creates a wrapper around the main Descent3 executable that automatically looks in the correct path in the Nix store. Hopefully, this wrapper will only exist temporarily. I have an unfinished Descent 3 pull request that adds a DEFAULT_ADDITIONAL_DIRS CMake option [1]. Once I can finish that pull request (DescentDevelopers/Descent3#623 needs to get merged first), we’ll be able to get rid of this wrapper and use DEFAULT_ADDITIONAL_DIRS instead. Additionally, if DescentDevelopers/Descent3#628 gets merged first, then that pull request will also probably make this wrapper unnecessary. [1]: --- pkgs/by-name/de/descent3/package.nix | 60 ++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/de/descent3/package.nix diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix new file mode 100644 index 000000000000..5027a8bc12e7 --- /dev/null +++ b/pkgs/by-name/de/descent3/package.nix @@ -0,0 +1,60 @@ +{ + descent3-unwrapped, + lib, + makeBinaryWrapper, + runCommand, +}: + +runCommand "descent3-${descent3-unwrapped.version}" + { + pname = "descent3"; + inherit (descent3-unwrapped) version; + nativeBuildInputs = [ makeBinaryWrapper ]; + passthru.unwrapped = descent3-unwrapped; + + meta = descent3-unwrapped.meta // { + # The code that produces the wrapper is in the Nixpkgs repo, and the + # Nixpkgs repo is MIT Licensed. + license = [ lib.licenses.mit ]; + longDescription = '' + Playing Descent 3 using the Nix package manager is a little bit awkward + at the moment. This wrapper makes it slightly less awkward. Here’s how + you use this wrapper: + + 1. Install the `descent3` package, or start an ephemeral shell with the + `descent3` package. + + 2. Find the documentation folder for `descent3-unwrapped` by running this + command: + + ```bash + nix-instantiate --eval --expr '(import { }).descent3-unwrapped + "/share/doc/Descent3"' + ``` + + 3. Open `/USAGE.md`. + + 4. Follow steps 1–6 of Descent 3’s usage instructions. + + 5. Change directory into the `D3-open-source` folder: + + ```bash + cd + ``` + + 6. Start Descent 3 by running this command: + + ```bash + Descent3 + ``` + ''; + }; + } + '' + mkdir --parents "$out/bin" + descent3_unwrapped=${lib.strings.escapeShellArg descent3-unwrapped} + makeBinaryWrapper \ + "$descent3_unwrapped/bin/Descent3" \ + "$out/bin/Descent3" \ + --append-flags -additionaldir \ + --append-flags "$descent3_unwrapped/share" + '' From d3d033a38fc327bf97cfc7a99424a6cff3daa5c9 Mon Sep 17 00:00:00 2001 From: Chen Date: Mon, 11 Nov 2024 21:43:27 +0800 Subject: [PATCH 012/136] autosubst2: init at unstable-2022-07-04 --- pkgs/by-name/au/autosubst2/imports.patch | 72 ++++++++++++++++++++++++ pkgs/by-name/au/autosubst2/package.nix | 49 ++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 pkgs/by-name/au/autosubst2/imports.patch create mode 100644 pkgs/by-name/au/autosubst2/package.nix diff --git a/pkgs/by-name/au/autosubst2/imports.patch b/pkgs/by-name/au/autosubst2/imports.patch new file mode 100644 index 000000000000..a9e1d766cc7e --- /dev/null +++ b/pkgs/by-name/au/autosubst2/imports.patch @@ -0,0 +1,72 @@ +diff --git a/Src/Autosubst/GenAutomation.hs b/Src/Autosubst/GenAutomation.hs +index f1c205c..6f48895 100755 +--- a/Src/Autosubst/GenAutomation.hs ++++ b/Src/Autosubst/GenAutomation.hs +@@ -7,6 +7,7 @@ import Autosubst.Names + import Autosubst.Syntax + import Autosubst.Tactics + import Autosubst.Types ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.State.Lazy +diff --git a/Src/Autosubst/GenCode.hs b/Src/Autosubst/GenCode.hs +index 9145915..d4b7569 100755 +--- a/Src/Autosubst/GenCode.hs ++++ b/Src/Autosubst/GenCode.hs +@@ -5,6 +5,7 @@ module Autosubst.GenCode (generateCode) where + import Autosubst.Generator + import Autosubst.ModularGenerator + import Autosubst.Types ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.RWS hiding ((<>)) +diff --git a/Src/Autosubst/GenM.hs b/Src/Autosubst/GenM.hs +index 59483c1..3a4a447 100755 +--- a/Src/Autosubst/GenM.hs ++++ b/Src/Autosubst/GenM.hs +@@ -2,6 +2,7 @@ + {-# LANGUAGE MultiParamTypeClasses #-} + module Autosubst.GenM where + ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.RWS +diff --git a/Src/Autosubst/Generator.hs b/Src/Autosubst/Generator.hs +index 576db42..264b836 100755 +--- a/Src/Autosubst/Generator.hs ++++ b/Src/Autosubst/Generator.hs +@@ -8,6 +8,7 @@ import Autosubst.Names + import Autosubst.Syntax + import Autosubst.Tactics + import Autosubst.Types ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.RWS hiding ((<>)) +diff --git a/Src/Autosubst/ModularGenerator.hs b/Src/Autosubst/ModularGenerator.hs +index 323c1b1..dae8346 100755 +--- a/Src/Autosubst/ModularGenerator.hs ++++ b/Src/Autosubst/ModularGenerator.hs +@@ -7,6 +7,7 @@ import Autosubst.Names + import Autosubst.Syntax + import Autosubst.Tactics + import Autosubst.Types ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.State.Lazy +diff --git a/Src/Autosubst/Tactics.hs b/Src/Autosubst/Tactics.hs +index ef3545c..cdd38fb 100755 +--- a/Src/Autosubst/Tactics.hs ++++ b/Src/Autosubst/Tactics.hs +@@ -2,6 +2,7 @@ + {-# LANGUAGE MultiParamTypeClasses #-} + module Autosubst.Tactics where + ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Reader + import Control.Monad.RWS hiding ((<>)) diff --git a/pkgs/by-name/au/autosubst2/package.nix b/pkgs/by-name/au/autosubst2/package.nix new file mode 100644 index 000000000000..e1fb55fb6824 --- /dev/null +++ b/pkgs/by-name/au/autosubst2/package.nix @@ -0,0 +1,49 @@ +{ + lib, + haskellPackages, + fetchFromGitHub, +}: + +haskellPackages.mkDerivation { + pname = "autosubst2"; + version = "0-unstable-2022-07-04"; + + src = fetchFromGitHub { + owner = "uds-psl"; + repo = "autosubst2"; + rev = "8a71e1dc4dea81f13a9572ea302064eb374566c6"; + hash = "sha256-3n87NBi3NbuDb44/oEnzjNk/TAHUwATJYuaw70k/tpk="; + }; + patches = [ ./imports.patch ]; + + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = with haskellPackages; [ + base + parsec + containers + mtl + array + wl-pprint + graphviz + text + ]; + executableHaskellDepends = with haskellPackages; [ + base + optparse-applicative + wl-pprint + directory + ]; + testHaskellDepends = with haskellPackages; [ + base + QuickCheck + containers + ]; + doCheck = false; + + homepage = "https://github.com/uds-psl/autosubst2"; + description = "Tool for generating de Bruijn boilerplate Coq code to handle substitutions in languages with binders"; + maintainers = with lib.maintainers; [ chen ]; + license = lib.licenses.bsd3; + mainProgram = "as2-exe"; +} From 8199516be8d5b1d23ecfc59dae8df9823a5b911b Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 14 Mar 2024 18:46:04 +0100 Subject: [PATCH 013/136] bio-gappa: init at 0.8.4 Update pkgs/by-name/bi/bio-gappa/package.nix Co-authored-by: Aleksana Update pkgs/by-name/bi/bio-gappa/package.nix Co-authored-by: Aleksana Update pkgs/by-name/bi/bio-gappa/package.nix Co-authored-by: Aleksana Fixed package name Update pkgs/by-name/bi/bio-gappa/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> Update pkgs/by-name/bi/bio-gappa/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> Reformatted with nixfmt-rfc-style --- pkgs/by-name/bi/bio-gappa/package.nix | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/bi/bio-gappa/package.nix diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix new file mode 100644 index 000000000000..da1c70583844 --- /dev/null +++ b/pkgs/by-name/bi/bio-gappa/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + autoconf, + pkg-config, + libz, + bzip2, + xz, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bio-gappa"; + version = "0.8.4"; + + src = fetchFromGitHub { + owner = "lczech"; + repo = "gappa"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VAp9e5Cu3tTeWSOTZ8kPG1eOyocYZiJsy/s+MWbCMLI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + autoconf + ]; + + buildInputs = [ + libz + bzip2 + xz + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 ../bin/gappa $out/bin/gappa + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/lczech/gappa"; + description = "Toolkit for analyzing and visualizing phylogenetic (placement) data"; + longDescription = '' + gappa is a collection of commands for working with phylogenetic data. Its + main focus are evolutionary placements of short environmental sequences + on a reference phylogenetic tree. Such data are typically produced by + tools such as EPA-ng, RAxML-EPA or pplacer, and usually stored in jplace + files. + ''; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ bzizou ]; + mainProgram = "gappa"; + }; +}) From 6456702e1233c3606f7214fc92532b47fa63e0e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 09:46:02 +0000 Subject: [PATCH 014/136] htslib: 1.19.1 -> 1.21 --- pkgs/by-name/ht/htslib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ht/htslib/package.nix b/pkgs/by-name/ht/htslib/package.nix index c7e14e03ca00..f38569688570 100644 --- a/pkgs/by-name/ht/htslib/package.nix +++ b/pkgs/by-name/ht/htslib/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.19.1"; + version = "1.21"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ii1001dPtnsVjGmIyYDuqrqKBlb15P+3a1+lfwNZM+w="; + sha256 = "sha256-hLUQ5zX0ljZB8m/YjIq97oH/TLYhaDEK5xZjaqwPGCM="; }; # perl is only used during the check phase. From 9625d9bf0c4c9dbbc355bedbb0e036a73a1de462 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Wed, 11 Dec 2024 23:03:42 +0800 Subject: [PATCH 015/136] maintainers: add xiaoxiangmoe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80478f7b5985..a17941559c9f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24332,6 +24332,12 @@ github = "peterablehmann"; githubId = 36541313; }; + xiaoxiangmoe = { + name = "ZHAO JinXiang"; + email = "xiaoxiangmoe@gmail.com"; + github = "xiaoxiangmoe"; + githubId = 8111351; + }; xinyangli = { email = "lixinyang411@gmail.com"; matrix = "@me:xinyang.life"; From a17c823d401ea8acf7c4c1f65d3bec90a21e6f03 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Wed, 11 Dec 2024 23:30:57 +0800 Subject: [PATCH 016/136] affine-bin: rename affine to affine-bin --- pkgs/by-name/af/{affine => affine-bin}/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename pkgs/by-name/af/{affine => affine-bin}/package.nix (98%) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine-bin/package.nix similarity index 98% rename from pkgs/by-name/af/affine/package.nix rename to pkgs/by-name/af/affine-bin/package.nix index f66da1181d10..6a47b5664f26 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation ( }; in { - pname = "affine"; + pname = "affine-bin"; version = "0.17.5"; src = fetchurl { url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; From cb237b0342b66b4f33f87862fc3bfeb85313184b Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Wed, 11 Dec 2024 23:42:07 +0800 Subject: [PATCH 017/136] affine-bin: add macos support --- pkgs/by-name/af/affine-bin/package.nix | 199 +++++++++++++++++-------- 1 file changed, 134 insertions(+), 65 deletions(-) diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index 6a47b5664f26..b576208ee505 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -1,75 +1,144 @@ { - lib, - fetchurl, - stdenvNoCC, copyDesktopItems, + electron, + fetchFromGitHub, + fetchurl, + lib, makeDesktopItem, makeWrapper, + stdenvNoCC, unzip, - electron, + buildType ? "stable", commandLineArgs ? "", }: - +let + hostPlatform = stdenvNoCC.hostPlatform; + nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform` + nodeArch = # nodejs's `process.arch` + { + "x86_64" = "x64"; + "aarch64" = "arm64"; + } + .${hostPlatform.parsed.cpu.name} + or (throw "affine-bin(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); +in stdenvNoCC.mkDerivation ( finalAttrs: - let - icon = fetchurl { - url = "https://raw.githubusercontent.com/toeverything/AFFiNE/v${finalAttrs.version}/packages/frontend/core/public/favicon-192.png"; - hash = "sha256-smZ5W7fy3TK3bvjwV4i71j2lVmKSZcyhMhcWfPxNnN4="; - }; - in - { - pname = "affine-bin"; - version = "0.17.5"; - src = fetchurl { - url = "https://github.com/toeverything/AFFiNE/releases/download/v${finalAttrs.version}/affine-${finalAttrs.version}-stable-linux-x64.zip"; - hash = "sha256-lK5DDI9CKRneY4AwMI4r1qlGyYtQG4Xi8Ys4I3jawTk="; - }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - unzip - ]; - postInstall = '' - mkdir -p $out/lib - cp -r ./resources/* -t $out/lib/ - mkdir -p $out/share/doc/affine/ - cp LICENSE* $out/share/doc/affine/ - install -Dm644 ${icon} $out/share/pixmaps/affine.png - makeWrapper "${electron}/bin/electron" $out/bin/affine \ - --inherit-argv0 \ - --add-flags $out/lib/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - ''; - desktopItems = [ - (makeDesktopItem { - name = "affine"; - desktopName = "AFFiNE"; - exec = "affine %U"; - terminal = false; - icon = "affine"; - startupWMClass = "affine"; - categories = [ "Utility" ]; - }) - ]; - meta = { - description = "Workspace with fully merged docs, whiteboards and databases"; - longDescription = '' - AFFiNE is an open-source, all-in-one workspace and an operating - system for all the building blocks that assemble your knowledge - base and much more -- wiki, knowledge management, presentation - and digital assets - ''; - homepage = "https://affine.pro/"; - downloadPage = "https://affine.pro/download"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - richar - redyf - ]; - mainProgram = "affine"; - platforms = [ "x86_64-linux" ]; - }; - } + ( + { + # https://github.com/toeverything/AFFiNE/releases/tag/v0.18.1 + version = "0.18.1"; + githubSourceCode = fetchFromGitHub { + owner = "toeverything"; + repo = "AFFiNE"; + rev = "8b066a4b398aace25a20508a8e3c1a381721971f"; + hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + }; + productName = if buildType == "stable" then "AFFiNE" else "AFFiNE-" + buildType; + binName = lib.toLower finalAttrs.productName; + pname = "${finalAttrs.binName}-bin"; + meta = + { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + richar + redyf + xiaoxiangmoe + ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + } + // lib.optionalAttrs hostPlatform.isLinux { + mainProgram = finalAttrs.binName; + }; + + src = ( + let + inherit (finalAttrs) version; + affinePrebuiltBinariesHashes = { + darwin-arm64 = "I8lOO97MNLkha0utWPAP4EKv9HiPMWpLi2ibvXjzjhdl7abgSPmMKbv1dGHxMzgMzGbDzhzKqzhYtJI+0Asfzw=="; + darwin-x64 = "LZdd7yHJx9Hx0Po8NQgeDp0BhIyXGr0QsbF6bWP5pS08c4fdtE9UzNPfJGfzz/snTkWfKMQZop0Ea4fYGosr1Q=="; + linux-x64 = "+impaFLuvcfpj4QjHwjZ06+fUpsxxRlk4eWO6+E4xkBMrV43gwZGeSeAw2pMgXogRGb/Oy6XUoA7o8tTQt9J6A=="; + }; + platform = if hostPlatform.isLinux then "linux" else "macos"; + in + fetchurl { + # example: https://github.com/toeverything/AFFiNE/releases/download/v0.18.1/affine-0.18.1-stable-darwin-arm64.zip + url = "https://github.com/toeverything/AFFiNE/releases/download/v${version}/affine-${version}-${buildType}-${platform}-${nodeArch}.zip"; + sha512 = affinePrebuiltBinariesHashes."${nodePlatform}-${nodeArch}"; + } + ); + + nativeBuildInputs = + [ + unzip + ] + ++ lib.optionals hostPlatform.isLinux [ + copyDesktopItems + makeWrapper + ]; + + installPhase = + let + inherit (finalAttrs) binName productName; + in + if hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/Applications + cd .. + mv ${productName}.app $out/Applications + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir --parents $out/lib/${binName}/ + mv ./{resources,LICENSE*} $out/lib/${binName}/ + install -Dm644 "${finalAttrs.githubSourceCode}/packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png" $out/share/icons/hicolor/64x64/apps/${binName}.png + + makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ + --inherit-argv0 \ + --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + runHook postInstall + ''; + } + // lib.optionalAttrs hostPlatform.isLinux { + desktopItems = + let + inherit (finalAttrs) binName productName; + in + [ + (makeDesktopItem { + name = binName; + desktopName = productName; + comment = "AFFiNE Desktop App"; + exec = "${binName} %U"; + terminal = false; + icon = binName; + startupWMClass = binName; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/${binName}" ]; + }) + ]; + } + ) ) From e3f98e17bfd443d826229f1b0f304634e5c14ad8 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Thu, 12 Dec 2024 00:12:17 +0800 Subject: [PATCH 018/136] affine: add affine building from source --- pkgs/by-name/af/affine/package.nix | 244 +++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 pkgs/by-name/af/affine/package.nix diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix new file mode 100644 index 000000000000..1fb002189e08 --- /dev/null +++ b/pkgs/by-name/af/affine/package.nix @@ -0,0 +1,244 @@ +{ + cacert, + cargo, + copyDesktopItems, + electron_33, + fetchFromGitHub, + fetchurl, + findutils, + jq, + lib, + makeDesktopItem, + makeWrapper, + nodejs_20, + rsync, + rustPlatform, + rustc, + stdenv, + stdenvNoCC, + yarn, + zip, + buildType ? "stable", + commandLineArgs ? "", +}: +let + hostPlatform = stdenvNoCC.hostPlatform; + nodePlatform = hostPlatform.parsed.kernel.name; # nodejs's `process.platform` + nodeArch = # nodejs's `process.arch` + { + "x86_64" = "x64"; + "aarch64" = "arm64"; + } + .${hostPlatform.parsed.cpu.name} + or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); + electron = electron_33; +in +stdenv.mkDerivation ( + finalAttrs: + ( + { + productName = if buildType == "stable" then "AFFiNE" else "AFFiNE-" + buildType; + binName = lib.toLower finalAttrs.productName; + pname = finalAttrs.binName; + + # https://github.com/toeverything/AFFiNE/releases/tag/v0.18.1 + version = "0.18.1"; + GITHUB_SHA = "8b066a4b398aace25a20508a8e3c1a381721971f"; + src = fetchFromGitHub { + owner = "toeverything"; + repo = "AFFiNE"; + rev = finalAttrs.GITHUB_SHA; + hash = "sha256-TWwojG3lqQlQFX3BKoFjJ27a3T/SawXgNDO6fP6gW4k="; + }; + + meta = + { + description = "Workspace with fully merged docs, whiteboards and databases"; + longDescription = '' + AFFiNE is an open-source, all-in-one workspace and an operating + system for all the building blocks that assemble your knowledge + base and much more -- wiki, knowledge management, presentation + and digital assets + ''; + homepage = "https://affine.pro/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + } + // lib.optionalAttrs hostPlatform.isLinux { + mainProgram = finalAttrs.binName; + }; + + env = { + BUILD_TYPE = buildType; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + src = finalAttrs.src; + hash = "sha256-5s/X9CD/H9rSn7SqMHioLg1KRP7y9fsozdFRY3hNiP8="; + }; + yarnOfflineCache = stdenvNoCC.mkDerivation { + name = "yarn-offline-cache"; + src = finalAttrs.src; + nativeBuildInputs = [ + yarn + cacert + ]; + supportedArchitectures = builtins.toJSON { + os = [ + "darwin" + "linux" + ]; + cpu = [ + "arm64" + "x64" + ]; + libc = [ + "glibc" + "musl" + ]; + }; + buildPhase = '' + export HOME="$NIX_BUILD_TOP" + export CI=1 + + mkdir -p $out + yarn config set enableTelemetry false + yarn config set cacheFolder $out + yarn config set enableGlobalCache false + yarn config set supportedArchitectures --json "$supportedArchitectures" + + yarn install --immutable --mode=skip-build + ''; + dontInstall = true; + outputHashMode = "recursive"; + outputHash = "sha256-HueTia+1ApfvbBK/b+iE84TB1DCWIDLoQ9XhjYlGCUs="; + }; + nativeBuildInputs = + [ + nodejs_20 + yarn + cargo + rustc + findutils + zip + jq + rsync + ] + ++ lib.optionals hostPlatform.isLinux [ + copyDesktopItems + makeWrapper + ]; + + patchPhase = '' + runHook prePatchPhase + + sed -i '/packagerConfig/a \ electronZipDir: process.env.ELECTRON_FORGE_ELECTRON_ZIP_DIR,' packages/frontend/apps/electron/forge.config.mjs + + runHook postPatchPhase + ''; + + configurePhase = + let + electronContentPath = + electron + (if hostPlatform.isLinux then "/libexec/electron/" else "/Applications/"); + in + '' + runHook preConfigurePhase + + export HOME="$NIX_BUILD_TOP" + export CI=1 + + # cargo config + mkdir -p .cargo + cat $cargoDeps/.cargo/config.toml >> .cargo/config.toml + ln -s $cargoDeps @vendor@ + + # yarn config + yarn config set enableTelemetry false + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + # electron config + ELECTRON_VERSION_IN_LOCKFILE=$(yarn why electron --json | tail --lines 1 | jq --raw-output '.children | to_entries | first | .key ' | cut -d : -f 2) + rsync --archive --chmod=u+w ${electronContentPath} $HOME/.electron-prebuilt-zip-tmp + export ELECTRON_FORGE_ELECTRON_ZIP_DIR=$PWD/.electron_zip_dir + mkdir -p $ELECTRON_FORGE_ELECTRON_ZIP_DIR + (cd $HOME/.electron-prebuilt-zip-tmp && zip --recurse-paths - .) > $ELECTRON_FORGE_ELECTRON_ZIP_DIR/electron-v$ELECTRON_VERSION_IN_LOCKFILE-${nodePlatform}-${nodeArch}.zip + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + + runHook postConfigurePhase + ''; + buildPhase = '' + runHook preBuild + + # first build + yarn workspaces focus @affine/electron @affine/monorepo + CARGO_NET_OFFLINE=true yarn workspace @affine/native build + BUILD_TYPE=${buildType} SKIP_NX_CACHE=1 yarn workspace @affine/electron generate-assets + + # second build + yarn config set nmMode classic + yarn config set nmHoistingLimits workspaces + find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + + yarn workspaces focus @affine/electron @affine/monorepo + BUILD_TYPE=${buildType} SKIP_WEB_BUILD=1 SKIP_BUNDLE=1 HOIST_NODE_MODULES=1 yarn workspace @affine/electron make + + runHook postBuild + ''; + installPhase = + let + inherit (finalAttrs) binName productName; + in + if hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/Applications + mv packages/frontend/apps/electron/out/${buildType}/${productName}-darwin-${nodeArch}/${productName}.app $out/Applications + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir --parents $out/lib/${binName}/ + mv packages/frontend/apps/electron/out/${buildType}/${productName}-linux-${nodeArch}/{resources,LICENSE*} $out/lib/${binName}/ + install -Dm644 packages/frontend/apps/electron/resources/icons/icon_${buildType}_64x64.png $out/share/icons/hicolor/64x64/apps/${binName}.png + + makeWrapper "${electron}/bin/electron" $out/bin/${binName} \ + --inherit-argv0 \ + --add-flags $out/lib/${binName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + runHook postInstall + ''; + } + // (lib.optionalAttrs hostPlatform.isLinux { + desktopItems = + let + inherit (finalAttrs) binName productName; + in + [ + (makeDesktopItem { + name = binName; + desktopName = productName; + comment = "AFFiNE Desktop App"; + exec = "${binName} %U"; + terminal = false; + icon = binName; + startupWMClass = binName; + categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/${binName}" ]; + }) + ]; + }) + ) +) From ee4d933d36ad2adfb9f45f3abbd396b2f074a0e0 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Fri, 13 Dec 2024 13:42:58 +0200 Subject: [PATCH 019/136] vulnix: 1.10.1-unstable-2024-04-02 -> 1.10.2 Signed-off-by: Henri Rosten --- pkgs/by-name/vu/vulnix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix index e124fffbbe07..23e9c13ed400 100644 --- a/pkgs/by-name/vu/vulnix/package.nix +++ b/pkgs/by-name/vu/vulnix/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.10.1-unstable-2024-04-02"; + version = "1.10.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "vulnix"; - rev = "ebd8ea84553c0fd95bc3042584b495560821500f"; - hash = "sha256-huC520cLPjcmnbh+qOamyVfiIJNrCUpwK+orEp+X2LQ="; + rev = "9abfc80da0b4135e982332e448a3969f3b28785b"; + hash = "sha256-gSgAGN7LlciW4uY3VS49CbZ9WuRUcduJ5V7JesA8OVo="; }; postPatch = '' From fa8320d2cc9ff5d329738c6e5f6c5481f237f9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Dec 2024 22:43:36 +0100 Subject: [PATCH 020/136] python312Packages.django-q2: init at 1.7.4 --- .../python-modules/django-q2/default.nix | 99 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 101 insertions(+) create mode 100644 pkgs/development/python-modules/django-q2/default.nix diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix new file mode 100644 index 000000000000..c9ec30eba2e5 --- /dev/null +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -0,0 +1,99 @@ +{ + lib, + arrow, + blessed, + bson, + buildPythonPackage, + croniter, + django, + django-picklefield, + django-redis, + fetchFromGitHub, + hiredis, + pkgs, + poetry-core, + pytest-django, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "django-q2"; + version = "1.7.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "django-q2"; + repo = "django-q2"; + rev = "refs/tags/v${version}"; + hash = "sha256-mp/IZkfT64xW42B1TEO6lSHxvLQbeH4td8vqZH7wUxM="; + }; + + postPatch = '' + substituteInPlace django_q/tests/settings.py \ + --replace-fail "HiredisParser" "_HiredisParser" + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + arrow + bson # required for mongodb but undocumented + django + django-picklefield + ]; + + nativeCheckInputs = [ + blessed + croniter + django-redis + # pyredis refuses to load with hiredis<3.0.0 + (hiredis.overrideAttrs ( + new: old: { + version = "3.1.0"; + src = old.src.override { + rev = "refs/tags/v${new.version}"; + hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; + }; + } + )) + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "django_q" ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + env = { + MONGO_HOST = "127.0.0.1"; + REDIS_HOST = "127.0.0.1"; + }; + + disabledTests = [ + # requires a running mongodb + "test_mongo" + ]; + + disabledTestPaths = [ + "django_q/tests/test_commands.py" + ]; + + pytestFlagsArray = [ "-vv" ]; + + meta = with lib; { + description = "Multiprocessing distributed task queue for Django based on Django-Q"; + homepage = "https://github.com/django-q2/django-q2"; + changelog = "https://github.com/django-q2/django-q2/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f605d17548c..9fb785ef1b1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3572,6 +3572,8 @@ self: super: with self; { django-q = callPackage ../development/python-modules/django-q { }; + django-q2 = callPackage ../development/python-modules/django-q2 { }; + django-scheduler = callPackage ../development/python-modules/django-scheduler { }; django-scim2 = callPackage ../development/python-modules/django-scim2 { }; From 1b8f54d2a16c480f59968427d052af9b00e51d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Dec 2024 23:01:07 +0100 Subject: [PATCH 021/136] mailmanPackages.hyperkitty: 1.3.9 -> 1.3.12 --- pkgs/servers/mail/mailman/hyperkitty.nix | 12 ++++++------ pkgs/servers/mail/mailman/python.nix | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 344970ebb564..05d265ba0284 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -7,27 +7,27 @@ with python3.pkgs; buildPythonPackage rec { - pname = "HyperKitty"; - version = "1.3.9"; + pname = "hyperkitty"; + version = "1.3.12"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchurl { url = "https://gitlab.com/mailman/hyperkitty/-/releases/${version}/downloads/hyperkitty-${version}.tar.gz"; - hash = "sha256-BfhCh4zZcfwoIfubW/+MUWXwh1yFOH/jpRdQdsj6lME="; + hash = "sha256-3rWCk37FvJ6pwdXYa/t2pNpCm2Dh/qb9aWTnxmfPFh0="; }; - nativeBuildInputs = [ + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ django django-gravatar2 django-haystack django-mailman3 - django-q + django-q2 django-compressor django-extensions djangorestframework diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 258cba0ab8b6..e107bd0bcea8 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -20,13 +20,12 @@ lib.fix (self: python3.override { [2] f931bc81d63f5cfda55ac73d754c87b3fd63b291 */ - # django-q tests fail with redis 5.0.0. - # https://gitlab.com/mailman/hyperkitty/-/issues/493 - redis = super.redis.overridePythonAttrs ({ pname, ... }: rec { - version = "4.6.0"; - src = fetchPypi { - inherit pname version; - hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0="; + # the redis python library only supports hiredis 3+ from version 5.1.0 onwards + hiredis = super.hiredis.overrideAttrs (new: { src, ... }: { + version = "3.1.0"; + src = src.override { + rev = "refs/tags/v${new.version}"; + hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; }; }); }) From 0fb39c5abbe057f748c1447212edff4c2c77e316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Dec 2024 23:01:19 +0100 Subject: [PATCH 022/136] mailmanPackages: use python 3.12 --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a81e3ccada7..cfd59265ca22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11669,11 +11669,7 @@ with pkgs; nodejs = nodejs_18; }; - mailmanPackages = callPackage ../servers/mail/mailman { - # Hyperkitty test fails with 3.12: - # https://gitlab.com/mailman/hyperkitty/-/issues/514 - python3 = python311; - }; + mailmanPackages = callPackage ../servers/mail/mailman { }; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; From b93e42b9428e2af77cca07c90b994bc58fdd0d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 13 Dec 2024 13:37:03 +0100 Subject: [PATCH 023/136] python3Packages.django-q: drop --- .../python-modules/django-q/default.nix | 93 ------------------- .../python-modules/django-q/pep-621.patch | 24 ----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 pkgs/development/python-modules/django-q/default.nix delete mode 100644 pkgs/development/python-modules/django-q/pep-621.patch diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix deleted file mode 100644 index fac1bfa327a8..000000000000 --- a/pkgs/development/python-modules/django-q/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - lib, - stdenv, - arrow, - blessed, - buildPythonPackage, - croniter, - django, - django-picklefield, - django-redis, - fetchFromGitHub, - future, - pkgs, - poetry-core, - pytest-django, - pytest-mock, - pytestCheckHook, - pythonOlder, - redis, - setuptools, -}: - -buildPythonPackage rec { - pname = "django-q"; - version = "1.3.9"; - pyproject = true; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "Koed00"; - repo = "django-q"; - rev = "refs/tags/v${version}"; - hash = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA="; - }; - - patches = [ ./pep-621.patch ]; - - build-system = [ - poetry-core - ]; - - pythonRelaxDeps = [ - "redis" - ]; - - dependencies = [ - django-picklefield - arrow - blessed - django - future - setuptools # for pkg_resources - ]; - - nativeCheckInputs = [ - croniter - django-redis - pytest-django - pytest-mock - pytestCheckHook - ] ++ django-redis.optional-dependencies.hiredis; - - pythonImportsCheck = [ "django_q" ]; - - preCheck = '' - ${pkgs.redis}/bin/redis-server & - REDIS_PID=$! - ''; - - postCheck = '' - kill $REDIS_PID - ''; - - # don't bother with two more servers to test - disabledTests = [ - "test_disque" - "test_mongo" - ]; - - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = with lib; { - description = "Multiprocessing distributed task queue for Django"; - homepage = "https://django-q.readthedocs.org"; - changelog = "https://github.com/Koed00/django-q/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ gador ]; - # django-q is unmaintained at the moment - # https://github.com/Koed00/django-q/issues/733 - broken = lib.versionAtLeast redis.version "5"; - }; -} diff --git a/pkgs/development/python-modules/django-q/pep-621.patch b/pkgs/development/python-modules/django-q/pep-621.patch deleted file mode 100644 index 5f89201e3511..000000000000 --- a/pkgs/development/python-modules/django-q/pep-621.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 9a83e90..07068ac 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -67,13 +67,15 @@ pytest-cov = "^2.12.0" - black = { version = "^21.5b1", allow-prereleases = true } - isort = {extras = ["requirements_deprecated_finder"], version = "^5.8.0"} - --[tool.poetry.extras] -+[build-system] - requires = ["poetry_core>=1.0.0"] --build-backend = ["poetry.core.masonry.api"] -+build-backend = "poetry.core.masonry.api" -+ -+[tool.poetry.extras] - testing = ["django-redis", "croniter", "hiredis", "psutil", "iron-mq", "boto3", "pymongo"] - rollbar = ["django-q-rollbar"] - sentry = ["django-q-sentry"] - - [tool.isort] - profile = "black" --multi_line_output = 3 -\ No newline at end of file -+multi_line_output = 3 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5d188743792e..1714d05a727d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -168,6 +168,7 @@ mapAliases ({ django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02 django_nose = django-nose; # added 2023-07-25 django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 + django-q = throw "django-q has been removed because it is unmaintained and was unused"; # added 2024-12-13 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9fb785ef1b1d..e31f7dc3b871 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3570,8 +3570,6 @@ self: super: with self; { django-pwa = callPackage ../development/python-modules/django-pwa { }; - django-q = callPackage ../development/python-modules/django-q { }; - django-q2 = callPackage ../development/python-modules/django-q2 { }; django-scheduler = callPackage ../development/python-modules/django-scheduler { }; From cf55aa8701953603bc80b733bbb9f92a4d76adfe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 13 Dec 2024 13:56:14 +0000 Subject: [PATCH 024/136] python312Packages.pycrdt: 0.10.8 -> 0.10.9 Diff: https://github.com/jupyter-server/pycrdt/compare/0.10.8...0.10.9 Changelog: https://github.com/jupyter-server/pycrdt/releases/tag/0.10.9 --- .../python-modules/pycrdt/Cargo.lock | 67 +++++++++---------- .../python-modules/pycrdt/default.nix | 4 +- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 3ed87e9cc77a..c2e62969d489 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" dependencies = [ "getrandom", ] @@ -152,9 +152,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ "once_cell", "wasm-bindgen", @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.167" +version = "0.2.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" +checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" [[package]] name = "lock_api" @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.10.8" +version = "0.10.9" dependencies = [ "pyo3", "yrs", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" dependencies = [ "cfg-if", "indoc", @@ -271,9 +271,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" dependencies = [ "once_cell", "target-lexicon", @@ -281,9 +281,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" dependencies = [ "libc", "pyo3-build-config", @@ -291,9 +291,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" dependencies = [ "heck", "proc-macro2", @@ -325,9 +325,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags", ] @@ -346,18 +346,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", @@ -448,9 +448,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -459,13 +459,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -474,9 +473,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -484,9 +483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -497,9 +496,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "windows-targets" diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 553393f3a1d6..f1a12eef0e4e 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.8"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; tag = version; - hash = "sha256-5ukP2J9Mm7yRVXZ6x5VbArF5GDxQvRvOpKEwiySzPV8="; + hash = "sha256-G0hmjSm1AP7CbnhT56Pxb/vVOQVGxSS4W4/CMGAeP7c="; }; postPatch = '' From d219a4f9cf84366784a729be1f07087c18132d32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 05:55:25 +0000 Subject: [PATCH 025/136] python312Packages.nodriver: 0.37 -> 0.38.post1 --- pkgs/development/python-modules/nodriver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix index 86572a31b2e9..803d69c2f909 100644 --- a/pkgs/development/python-modules/nodriver/default.nix +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nodriver"; - version = "0.37"; + version = "0.38.post1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FF/E0hNZvo26Urtgw+nBH5Rmk7UCaqAsckCLDMuCK0A="; + hash = "sha256-ffaA4wmwwPCH1KwBA1VnlLf63AgbYxguROD6J08o/4o="; }; disabled = pythonOlder "3.9"; From 50a4df38ee375da47eebe0dee8636c5c6ca0f4a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 07:24:26 +0000 Subject: [PATCH 026/136] matio: 1.5.27 -> 1.5.28 --- pkgs/by-name/ma/matio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matio/package.nix b/pkgs/by-name/ma/matio/package.nix index 3a2fde315779..e440b6626a80 100644 --- a/pkgs/by-name/ma/matio/package.nix +++ b/pkgs/by-name/ma/matio/package.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.27"; + version = "1.5.28"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-CmqgCxjEUStjqNJ5BrB5yMbtQdSyhE96SuWY4Y0i07M="; + sha256 = "sha256-naaYk0ohVprwWOY0hWRmb0UCnmwrCHjKDY+WCb93uNg="; }; meta = with lib; { From 98b7c502797c5769513e62b8a023c0e16d75a8d2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 14 Dec 2024 11:27:54 +0000 Subject: [PATCH 027/136] linuxKernels.linux_lqx: fix build by removing SCHED_CLASS_EXT option --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9a5b34e742ad..2b4a130467ea 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -124,6 +124,7 @@ let PSI = lib.mkForce (option no); RT_GROUP_SCHED = lib.mkForce (option no); SCHED_AUTOGROUP = lib.mkForce (option no); + SCHED_CLASS_EXT = lib.mkForce (option no); SCHED_CORE = lib.mkForce (option no); UCLAMP_TASK = lib.mkForce (option no); UCLAMP_TASK_GROUP = lib.mkForce (option no); From dc34232b0042a01a109dca55e0d71d5c02827177 Mon Sep 17 00:00:00 2001 From: tarneo Date: Sat, 14 Dec 2024 22:13:41 +0100 Subject: [PATCH 028/136] qutebrowser: 3.3.1 -> 3.4.0 Changelog: https://qutebrowser.com/doc/changelog.html --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index f0f0800b2ae4..1de7936f7d7f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -36,7 +36,7 @@ let stripRoot = false; }; - version = "3.3.1"; + version = "3.4.0"; in python3.pkgs.buildPythonApplication { @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-qttkrMxzC8mhXONByaBYCx82OD7Uh09U0xzh2r6U4Xo="; + hash = "sha256-gUEkwO0zdDDmE6HaNm1eOJBMsgSa+xUFlxRWylymIj4="; }; # Needs tox From e99418b6ce15e0351b92202a959c5a910dacebb7 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 15 Dec 2024 05:42:27 +0800 Subject: [PATCH 029/136] v2raya: remove with lib --- pkgs/by-name/v2/v2raya/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 243b36cb3d82..0d1989c5093c 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -87,12 +87,12 @@ buildGoModule { --prefix XDG_DATA_DIRS ":" ${assetsDir}/share ''; - meta = with lib; { + meta = { description = "Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel"; homepage = "https://github.com/v2rayA/v2rayA"; mainProgram = "v2rayA"; - license = licenses.agpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ ChaosAttractor ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ChaosAttractor ]; }; } From 98946d4714d26b0107c1ce89dc67e900c3252d36 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 15 Dec 2024 05:50:01 +0800 Subject: [PATCH 030/136] v2raya: 2.2.5.8 -> 2.2.6.3 --- pkgs/by-name/v2/v2raya/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix index 0d1989c5093c..2d54d4271225 100644 --- a/pkgs/by-name/v2/v2raya/package.nix +++ b/pkgs/by-name/v2/v2raya/package.nix @@ -17,13 +17,13 @@ }: let pname = "v2raya"; - version = "2.2.5.8"; + version = "2.2.6.3"; src = fetchFromGitHub { owner = "v2rayA"; repo = "v2rayA"; - rev = "refs/tags/v${version}"; - hash = "sha256-yFN7mG5qS7BAuCSvSSZFFiyytd7XZ4kJvctc8cU72Oc="; + tag = "v${version}"; + hash = "sha256-Du7DqOkneOFBiPK5BeQtnKRsX0Tcuhq8iiugDMGTk7o="; postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock"; }; @@ -34,7 +34,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/gui/yarn.lock"; - hash = "sha256-AZIYkW2u1l9IaDpR9xiKNpc0sGAarLKwHf5kGnzdpKw="; + hash = "sha256-AexW4FFGkQBQlci/FAm9rpfbPn76v+O3nMX3xHymhPw="; }; env.OUTPUT_DIR = placeholder "out"; @@ -60,7 +60,7 @@ buildGoModule { sourceRoot = "${src.name}/service"; - vendorHash = "sha256-Oa7YmxcZr5scbhNeqGxJOkryL2uHQQ3RkLGWJaIXq3s="; + vendorHash = "sha256-kK99Y0CgesvlaM2WsFIPgdtWo2975m9TqyJXoNv43yU="; ldflags = [ "-s" From 11aee8ec57a965e0374d480c2a4fdf558ee6d0a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 02:24:55 +0000 Subject: [PATCH 031/136] jellyfin-ffmpeg: 7.0.2-7 -> 7.0.2-8 --- pkgs/by-name/je/jellyfin-ffmpeg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index 18d906b1eda6..bde21bdc48a8 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -5,7 +5,7 @@ }: let - version = "7.0.2-7"; + version = "7.0.2-8"; in (ffmpeg_7-full.override { @@ -14,7 +14,7 @@ in owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-l1oCilqWE3NpSzrNHAepglL3BHXZ2yxcQfupFJ3zwvg="; + hash = "sha256-gpbMVVMV1ywbSb6A3IGFS/vnBk9EXTNzaW1r8Ygo1RY="; }; }).overrideAttrs (old: { pname = "jellyfin-ffmpeg"; From ca72baca85875cd3d9fd073cfd17ea00f3a784b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 05:37:25 +0000 Subject: [PATCH 032/136] handheld-daemon-ui: 3.3.0 -> 3.3.5 --- pkgs/by-name/ha/handheld-daemon-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index 28ebc6cb1a1e..2454a82642bb 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.3.0"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-Fc2MwZoy1CKiWvh/Z1P0OnfkyWy4aT6I1aIY8gEf69U="; + hash = "sha256-g8LB24WxpbsGDFHRI0c80m9XXZghKYiRyuRRoYvb34g="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in From 31da557c1c83698aab50524ebd22987db61144fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 14 Dec 2024 20:52:08 -0800 Subject: [PATCH 033/136] immich: update geodata Also include the geonames license CC-BY-4.0 in meta. --- pkgs/by-name/im/immich/package.nix | 19 ++++++++++++++----- pkgs/by-name/im/immich/sources.json | 4 ++++ pkgs/by-name/im/immich/update.sh | 22 ++++++++++++++++++++-- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 3ab09c8dec0a..11561c25b4da 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -50,9 +50,15 @@ let # The geodata website is not versioned, so we use the internet archive geodata = + let + inherit (sources.components.geonames) timestamp; + date = + "${lib.substring 0 4 timestamp}-${lib.substring 4 2 timestamp}-${lib.substring 6 2 timestamp}T" + + "${lib.substring 8 2 timestamp}:${lib.substring 10 2 timestamp}:${lib.substring 12 2 timestamp}Z"; + in runCommand "immich-geodata" { - outputHash = "sha256-imqSfzXaEMNo9T9tZr80sr/89n19kiFc8qwidFzRUaY="; + outputHash = sources.components.geonames.hash; outputHashMode = "recursive"; nativeBuildInputs = [ cacert @@ -64,15 +70,15 @@ let } '' mkdir $out - url="https://web.archive.org/web/20240724153050/http://download.geonames.org/export/dump" + url="https://web.archive.org/web/${timestamp}/http://download.geonames.org/export/dump" curl -Lo ./cities500.zip "$url/cities500.zip" curl -Lo $out/admin1CodesASCII.txt "$url/admin1CodesASCII.txt" curl -Lo $out/admin2Codes.txt "$url/admin2Codes.txt" curl -Lo $out/ne_10m_admin_0_countries.geojson \ - https://raw.githubusercontent.com/nvkelso/natural-earth-vector/ca96624a56bd078437bca8184e78163e5039ad19/geojson/ne_10m_admin_0_countries.geojson + https://github.com/nvkelso/natural-earth-vector/raw/ca96624a56bd078437bca8184e78163e5039ad19/geojson/ne_10m_admin_0_countries.geojson unzip ./cities500.zip -d $out/ - echo "2024-07-24T15:30:50Z" > $out/geodata-date.txt + echo "${date}" > $out/geodata-date.txt ''; src = fetchFromGitHub { @@ -241,7 +247,10 @@ buildNpmPackage' { meta = { description = "Self-hosted photo and video backup solution"; homepage = "https://immich.app/"; - license = lib.licenses.agpl3Only; + license = with lib.licenses; [ + agpl3Only + cc-by-40 # geonames + ]; maintainers = with lib.maintainers; [ dotlambda jvanbruegge diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 735452b0e5dc..61baf35adda7 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -17,6 +17,10 @@ "open-api/typescript-sdk": { "npmDepsHash": "sha256-GtqS59I+By1u6WcR+lDj2HKXVwh7jw5/N6MRdUctlaM=", "version": "1.122.3" + }, + "geonames": { + "timestamp": "20241215052013", + "hash": "sha256-Gv85Y5KAkeqNU8iMMKwepI5o14Z0s5aQbLJVxhtjY14=" } } } diff --git a/pkgs/by-name/im/immich/update.sh b/pkgs/by-name/im/immich/update.sh index a1a5e2e0585c..1e11085e3adf 100755 --- a/pkgs/by-name/im/immich/update.sh +++ b/pkgs/by-name/im/immich/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils +#!nix-shell -i bash -p curl jq prefetch-npm-deps nix-prefetch-github coreutils ripgrep set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -39,6 +39,24 @@ for npm_component in cli server web "open-api/typescript-sdk"; do '.components += {($npm_component): {npmDepsHash: $hash, version: $version}}' \ "$sources_tmp")" > "$sources_tmp" done - rm "$lock" + +url="http://download.geonames.org/export/dump" +curl -s "http://web.archive.org/save/$url/cities500.zip" +curl -s "http://web.archive.org/save/$url/admin1CodesASCII.txt" +curl -s "http://web.archive.org/save/$url/admin1Codes.txt" +timestamp=$(curl -s \ + "http://archive.org/wayback/available?url=$url/cities500.zip" \ + | jq -r ".archived_snapshots.closest.timestamp") +echo "$(jq --arg timestamp "$timestamp" --arg hash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" \ + '.components += {geonames: {timestamp: $timestamp, hash: $hash}}' \ + "$sources_tmp")" > "$sources_tmp" + +cp "$sources_tmp" sources.json +set +o pipefail +output="$(nix-build ../../../.. -A immich.geodata 2>&1 || true)" +set -o pipefail +hash=$(echo "$output" | rg 'got:\s+(sha256-.*)$' -or '$1') +echo "$(jq --arg hash "$hash" '.components.geonames.hash = $hash' "$sources_tmp")" > "$sources_tmp" + mv "$sources_tmp" sources.json From 4568afbd9cd26fa35f8e5a4aa5dbdcf402d2f69f Mon Sep 17 00:00:00 2001 From: Ivan Bastrakov Date: Sun, 15 Dec 2024 11:51:53 +0300 Subject: [PATCH 034/136] vscode-extensions.vscode-icons-team.vscode-icons: 12.9.0 -> 12.10.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d3b8c866366a..b758406ada20 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5333,8 +5333,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.9.0"; - hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4="; + version = "12.10.0"; + hash = "sha256-GNDLuszuJN3P0V25F4gm7yUJsFEQgFMMPMTFLWLIvSo="; }; meta = { description = "Bring real icons to your Visual Studio Code"; From 184f005c9b10216946e7904128a7518bcd7df438 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 15 Dec 2024 10:10:51 +0100 Subject: [PATCH 035/136] cloud-hypervisor: skip more tests that rely on KVM Builders may not have KVM. We were already trying to do this by skipping the vmm tests, but the hypervisor tests also rely on KVM. --- pkgs/by-name/cl/cloud-hypervisor/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index a7a0c60737c0..8c4feed3207c 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -36,6 +36,8 @@ rustPlatform.buildRustPackage rec { "--bins" "--lib" # Integration tests require root. "--exclude" + "hypervisor" # /dev/kvm + "--exclude" "net_util" # /dev/net/tun "--exclude" "vmm" # /dev/kvm From ebcac5c0e650376a87ed2a0f98959c31f8697171 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:03:34 +0100 Subject: [PATCH 036/136] python312Packages.thermobeacon-ble: refactor --- .../development/python-modules/thermobeacon-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index d6546fca8153..935fc419ccc5 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -29,9 +29,9 @@ buildPythonPackage rec { --replace " --cov=thermobeacon_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Thermobeacon BLE devices"; homepage = "https://github.com/bluetooth-devices/thermobeacon-ble"; changelog = "https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 5788aba073660d99fb87f4e37268c8f4c29e282b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:05:04 +0100 Subject: [PATCH 037/136] python312Packages.thermobeacon-ble: migrate to pytest-cov-stub --- .../python-modules/thermobeacon-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index 935fc419ccc5..e3ea50474612 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -24,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-XeLTY78zg+5HR+GH9bHl2t86ifcWm7AA4zSwJOknsdc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=thermobeacon_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,7 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "thermobeacon_ble" ]; From e104c2fc1a29e4a52c5be43f8acd7bbeed71b6d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:11:24 +0100 Subject: [PATCH 038/136] python312Packages.thermopro-ble: refactor --- .../python-modules/thermopro-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index 1308da232617..a3fbf15c4973 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "thermopro-ble"; version = "0.10.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bluetooth-devices"; - repo = pname; + repo = "thermopro-ble"; rev = "refs/tags/v${version}"; hash = "sha256-xaRbp9XLCDGJ0NE0TzJygn2OzqvSFszs97vGHawCkzU="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Thermopro BLE devices"; homepage = "https://github.com/bluetooth-devices/thermopro-ble"; changelog = "https://github.com/Bluetooth-Devices/thermopro-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 82b2ac13af0505cc3ec67ffd7eae7b59d0a786ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:21:02 +0100 Subject: [PATCH 039/136] python312Packages.thermopro-ble: migrate to pytest-cov-stub --- .../python-modules/thermopro-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index a3fbf15c4973..ff83d59a08a3 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=thermopro_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "thermopro_ble" ]; From e3065e63cefac21daa9cf7f937777507659d90ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:26:53 +0100 Subject: [PATCH 040/136] python312Pacakges.sensirion-ble: refactor --- pkgs/development/python-modules/sensirion-ble/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sensirion-ble/default.nix b/pkgs/development/python-modules/sensirion-ble/default.nix index 8dea1faea5e9..460d9bd2b1ad 100644 --- a/pkgs/development/python-modules/sensirion-ble/default.nix +++ b/pkgs/development/python-modules/sensirion-ble/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { pname = "sensirion-ble"; version = "0.1.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "akx"; @@ -29,9 +29,9 @@ buildPythonPackage rec { --replace " --cov=sensirion_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth From dbf39d72a92af8809f7b2db8338ab068b0845396 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:32:58 +0100 Subject: [PATCH 041/136] python312Packages.sensirion-ble: enable tests --- .../python-modules/sensirion-ble/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/sensirion-ble/default.nix b/pkgs/development/python-modules/sensirion-ble/default.nix index 460d9bd2b1ad..17e583d6b0f0 100644 --- a/pkgs/development/python-modules/sensirion-ble/default.nix +++ b/pkgs/development/python-modules/sensirion-ble/default.nix @@ -1,13 +1,15 @@ { lib, + bluetooth-data-tools, + bluetooth-sensor-state-data, buildPythonPackage, fetchFromGitHub, hatchling, - bluetooth-data-tools, - bluetooth-sensor-state-data, home-assistant-bluetooth, - sensor-state-data, + pytest-cov-stub, + pytestCheckHook, pythonOlder, + sensor-state-data, }: buildPythonPackage rec { @@ -24,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-VeUfrQ/1Hqs9yueUKcv/ZpCDEEy84VDcZpuTT4fXSGw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensirion_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ hatchling ]; dependencies = [ @@ -38,6 +35,11 @@ buildPythonPackage rec { sensor-state-data ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; + pythonImportsCheck = [ "sensirion_ble" ]; meta = with lib; { From 589fe5cdc1d4d677497b1fabbbac26b7c28e237a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:43:40 +0100 Subject: [PATCH 042/136] python312Packages.sensorpro-ble: refactor --- .../python-modules/sensorpro-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 4a730bf48d92..6c7c566973cf 100644 --- a/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "sensorpro-ble"; version = "0.5.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "sensorpro-ble"; rev = "refs/tags/v${version}"; hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; @@ -29,9 +29,9 @@ buildPythonPackage rec { --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Sensorpro BLE devices"; homepage = "https://github.com/Bluetooth-Devices/sensorpro-ble"; changelog = "https://github.com/Bluetooth-Devices/sensorpro-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From bc826287eff595492703bb2a0c66e029391a612f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:45:46 +0100 Subject: [PATCH 043/136] python312Packages.sensirion-ble: migrate to pytest-cov-stub --- .../python-modules/sensorpro-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sensorpro-ble/default.nix b/pkgs/development/python-modules/sensorpro-ble/default.nix index 6c7c566973cf..edf61cf40ef8 100644 --- a/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -24,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-Zqa6qa0Jw79Iu4VEw6KN0GsZcC1X7OpiYUiyT4zwKyY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpro_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,7 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "sensorpro_ble" ]; From bf389406c821c8068510901aa0b77649f84c31da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:49:06 +0100 Subject: [PATCH 044/136] python312Packages.ruuvitag-ble: refactor --- .../python-modules/ruuvitag-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix index 629e3c539954..98a62ee95fb7 100644 --- a/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -14,20 +14,20 @@ buildPythonPackage rec { pname = "ruuvitag-ble"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "ruuvitag-ble"; rev = "refs/tags/v${version}"; hash = "sha256-J+807p2mE+VZ0oqldFtjdcNGsRTkAU54s6byQSGrng4="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Ruuvitag BLE devices"; homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From f8b6887e5003cfa7076aa46d24a37588363237dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:55:04 +0100 Subject: [PATCH 045/136] python312Packages.ruuvitag-ble: migrate to pytest-cov-stub --- .../python-modules/ruuvitag-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix index 98a62ee95fb7..3727519c563f 100644 --- a/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, hatchling, home-assistant-bluetooth, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -34,12 +35,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=ruuvitag_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "ruuvitag_ble" ]; From e11fe5a933c21746951e9cfd9e27204adeb77962 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 11:59:20 +0100 Subject: [PATCH 046/136] python312Packages.bluemaestro-ble: refactor --- .../python-modules/bluemaestro-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index d1f8cbd91264..0abea089d86e 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "bluemaestro-ble"; version = "0.2.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "bluemaestro-ble"; rev = "refs/tags/v${version}"; hash = "sha256-mJ5JNGN4F9U3WMJQDwiZwuxE0zOirwo1sWF3/bVwXhY="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for bluemaestro BLE devices"; homepage = "https://github.com/Bluetooth-Devices/bluemaestro-ble"; changelog = "https://github.com/Bluetooth-Devices/bluemaestro-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 66fd6878e3606379a4a36fdce2a2ced48dbab4ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:08:14 +0100 Subject: [PATCH 047/136] python312Packages.bluemaestro-ble: migrate to pytest-cov-stub --- .../python-modules/bluemaestro-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 0abea089d86e..d153c721f7aa 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bluemaestro_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "bluemaestro_ble" ]; From f79b3ad0b7e0a6ab035c60d4548fd9a1a917fc85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:15:32 +0100 Subject: [PATCH 048/136] python312Packages.tilt-ble: refactor --- pkgs/development/python-modules/tilt-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index 11c8961308b7..c4e54d06e101 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "tilt-ble"; version = "0.2.4"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "tilt-ble"; rev = "refs/tags/v${version}"; hash = "sha256-ok9XWx47hcke535480NORfS1pSagaOJvMR48lYTa/Tg="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Tilt BLE devices"; homepage = "https://github.com/Bluetooth-Devices/tilt-ble"; changelog = "https://github.com/Bluetooth-Devices/tilt-ble/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 54beae6be30716961d82bc7863b2e62436a24aee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:16:56 +0100 Subject: [PATCH 049/136] python312Packages.tilt-ble: migrate to pytest-cov-stub --- pkgs/development/python-modules/tilt-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index c4e54d06e101..4f9813e806e9 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=tilt_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "tilt_ble" ]; From e63d48968fd1a9de7ca61c89de12fe355dc6cc4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:18:52 +0100 Subject: [PATCH 050/136] python312Packages.oralb-ble: refactor --- pkgs/development/python-modules/oralb-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 11eba7e06ab1..8a8b82ff9ef3 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { --replace-fail " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bleak bleak-retry-connector bluetooth-data-tools @@ -58,7 +58,7 @@ buildPythonPackage rec { description = "Library for Oral B BLE devices"; homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; changelog = "https://github.com/Bluetooth-Devices/oralb-ble/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From bcb8ca139a5d92cfe0d0c8271eafc7a3f275225b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:20:01 +0100 Subject: [PATCH 051/136] python312Packages.oralb-ble: migrate to pytest-cov-stub --- pkgs/development/python-modules/oralb-ble/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 8a8b82ff9ef3..22498f872d6d 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -9,6 +9,7 @@ home-assistant-bluetooth, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -27,11 +28,6 @@ buildPythonPackage rec { hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -44,6 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From 74bd4b9fe610b4120dcc0714c3d4378d1992ccc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:22:21 +0100 Subject: [PATCH 052/136] python312Packages.govee-ble: migrate to pytest-cov-stub --- pkgs/development/python-modules/govee-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 840c0d0ae65f..49ceb0c1d124 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -25,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-w21paR1VTV/ZFnl9SKkJmFFDZMPgA3d7P6blceVvnVk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=govee_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -39,7 +35,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "govee_ble" ]; From fa0c52f825ab1edcb81ee0a3bb8b21d4bec6842c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:24:04 +0100 Subject: [PATCH 053/136] python312Packages.bthome-ble: migrate to pytest-cov-stub --- .../development/python-modules/bthome-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 8f48d2c0364d..93433f5e53e3 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -6,6 +6,7 @@ cryptography, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, pytz, @@ -26,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-TlZyNGfHNKN+6tCKepLS+fbgfq3a1uzeCXl25khl6d8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -41,7 +37,10 @@ buildPythonPackage rec { pytz ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "bthome_ble" ]; From 80a2776b8480736f549aba95008c60054daf2e74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:26:08 +0100 Subject: [PATCH 054/136] python312Packages.ibeacon-ble: refactor --- pkgs/development/python-modules/ibeacon-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index e0f9fc682355..ae19cb564811 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -30,9 +30,9 @@ buildPythonPackage rec { --replace-fail " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiooui home-assistant-bluetooth @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Library for iBeacon BLE devices"; homepage = "https://github.com/Bluetooth-Devices/ibeacon-ble"; changelog = "https://github.com/Bluetooth-Devices/ibeacon-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 50276b6b5421bb2cd618e674816234817b4fe2cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:27:40 +0100 Subject: [PATCH 055/136] python312Packages.ibeacon-ble: migrate to pytest-cov-stub --- .../python-modules/ibeacon-ble/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index ae19cb564811..732fe41c4efa 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -7,6 +7,8 @@ home-assistant-bluetooth, mac-vendor-lookup, poetry-core, + pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -25,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-1liSWxduYpjIMu7226EH4bsc7gca5g/fyL79W4ZMdU4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -39,7 +36,11 @@ buildPythonPackage rec { mac-vendor-lookup ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "ibeacon_ble" ]; From 823bcb4b3fd97fc5345a44dae36a2e3d6eb5ee87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:30:07 +0100 Subject: [PATCH 056/136] python312Packages.inkbird-ble: refactor --- .../development/python-modules/inkbird-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 4722aa190241..83eb6790aaed 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -14,20 +14,20 @@ buildPythonPackage rec { pname = "inkbird-ble"; version = "0.5.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "inkbird-ble"; rev = "refs/tags/v${version}"; hash = "sha256-cUqU4XaY7CORhzy0AGjXI5c5ka+PnF4cHdyopyEBcLo="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Library for Inkbird BLE devices"; homepage = "https://github.com/Bluetooth-Devices/inkbird-ble"; changelog = "https://github.com/Bluetooth-Devices/inkbird-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 6207343004adfa0eb8793c4a59ffd67fbbf33f69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:51:05 +0100 Subject: [PATCH 057/136] python312Packages.inkbird-ble: migrate to pytest-cov-stub --- .../python-modules/inkbird-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 83eb6790aaed..9d2979024029 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -34,12 +35,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=inkbird_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "inkbird_ble" ]; From 27cfd31dfbda683df76d5c5d18155bf692146d14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:53:56 +0100 Subject: [PATCH 058/136] python312Packages.kegtron-ble: refactor --- .../development/python-modules/kegtron-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix index 5d1928741b70..87670f77ead7 100644 --- a/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "kegtron-ble"; version = "0.4.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "kegtron-ble"; rev = "refs/tags/v${version}"; hash = "sha256-O5I5shW8nL2RAQptS2Bp/GI/4L6o0xXXmwYvRq0MM8o="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Kegtron BLE devices"; homepage = "https://github.com/Bluetooth-Devices/kegtron-ble"; changelog = "https://github.com/Bluetooth-Devices/kegtron-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From ada42a81feba0c07c75ecf4ad42c2261c117726c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 12:56:45 +0100 Subject: [PATCH 059/136] python312Packages.kegtron-ble: migrate to pytest-cov-stub --- .../python-modules/kegtron-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/kegtron-ble/default.nix b/pkgs/development/python-modules/kegtron-ble/default.nix index 87670f77ead7..add192df0ade 100644 --- a/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/pkgs/development/python-modules/kegtron-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=kegtron_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "kegtron_ble" ]; From a20970d8a2c6eddaccb14ec1c403584619c65ad5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:00:11 +0100 Subject: [PATCH 060/136] python312Packages.qingping-ble: refactor --- .../python-modules/qingping-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index 949ebbd187b8..127cba70bca2 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "qingping-ble"; version = "0.10.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bluetooth-devices"; - repo = pname; + repo = "qingping-ble"; rev = "refs/tags/v${version}"; hash = "sha256-5w3KGJLdHFv6kURKTz3YImZNjaETiVqbbJTJpBSLSo8="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Qingping BLE devices"; homepage = "https://github.com/bluetooth-devices/qingping-ble"; changelog = "https://github.com/Bluetooth-Devices/qingping-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 9af4e2056a81ed726f4c467d2863c8d9a3be94ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:03:23 +0100 Subject: [PATCH 061/136] python312Packages.qingping-ble: migrate to pytest-cov-stub --- .../python-modules/qingping-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index 127cba70bca2..6ee88b655f6f 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -5,6 +5,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=qingping_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "qingping_ble" ]; From 53de9d53cb20a4058d2c43b5fe9228b6a842c196 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:05:49 +0100 Subject: [PATCH 062/136] python312Packages.rapt-ble: refactor --- pkgs/development/python-modules/rapt-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/rapt-ble/default.nix b/pkgs/development/python-modules/rapt-ble/default.nix index a72e0f68d657..dc0d719620e7 100644 --- a/pkgs/development/python-modules/rapt-ble/default.nix +++ b/pkgs/development/python-modules/rapt-ble/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "rapt-ble"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sairon"; - repo = pname; + repo = "rapt-ble"; rev = "refs/tags/v${version}"; hash = "sha256-ozZwVgTV/xYl1nXLiybcPs6DQKocNdbxTEYDfYyQuvY="; }; @@ -30,9 +30,9 @@ buildPythonPackage rec { --replace " --cov=rapt_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Library for RAPT Pill hydrometer BLE devices"; homepage = "https://github.com/sairon/rapt-ble"; changelog = "https://github.com/sairon/rapt-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From eb2c93bdcb7feec3a7acf98bb89ec423343f88c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 12:34:26 +0000 Subject: [PATCH 063/136] beeper-bridge-manager: 0.12.2 -> 0.13.0 --- pkgs/by-name/be/beeper-bridge-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index a45069a9a898..f1bbec78e3c8 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bbctl"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "beeper"; repo = "bridge-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-Q8RgfkPw8KPkfORaPCwM18rNhzNm4UcH4hSdfYe4FZo="; + hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0="; }; - vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; + vendorHash = "sha256-yTNUxwnulQ+WbHdQbeNDghH4RPXurQMIgKDyXfrMxG8="; meta = { description = "Tool for running self-hosted bridges with the Beeper Matrix server."; From 06bb2b8cd243bad0f52140df61db1a167fc80257 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:07:34 +0100 Subject: [PATCH 064/136] python312Packages.rapt-ble: migrate to pytest-cov-stub --- pkgs/development/python-modules/rapt-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/rapt-ble/default.nix b/pkgs/development/python-modules/rapt-ble/default.nix index dc0d719620e7..488d4318278b 100644 --- a/pkgs/development/python-modules/rapt-ble/default.nix +++ b/pkgs/development/python-modules/rapt-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -25,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-ozZwVgTV/xYl1nXLiybcPs6DQKocNdbxTEYDfYyQuvY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=rapt_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -39,7 +35,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "rapt_ble" ]; From 9650c6720641add9329eca868a89e6caf37204dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:11:20 +0100 Subject: [PATCH 065/136] python312Packages.ld2410-ble: refactor --- pkgs/development/python-modules/ld2410-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix index b680db42a4d9..183bff598a2e 100644 --- a/pkgs/development/python-modules/ld2410-ble/default.nix +++ b/pkgs/development/python-modules/ld2410-ble/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ld2410-ble"; version = "0.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "930913"; - repo = pname; + repo = "ld2410-ble"; rev = "refs/tags/v${version}"; hash = "sha256-wQnE2hNT0UOnPJbHq1eayIO8g0XRZvEH6V19DL6RqoA="; }; @@ -29,9 +29,9 @@ buildPythonPackage rec { --replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout bleak bleak-retry-connector @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for the LD2410B modules from HiLinks"; homepage = "https://github.com/930913/ld2410-ble"; changelog = "https://github.com/930913/ld2410-ble/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 162eb6d3af4b5bee6545293b975afee3089dbf9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:12:36 +0100 Subject: [PATCH 066/136] python312Packages.ld2410-ble: migrate to pytest-cov-stub --- .../python-modules/ld2410-ble/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ld2410-ble/default.nix b/pkgs/development/python-modules/ld2410-ble/default.nix index 183bff598a2e..a811cdb3171a 100644 --- a/pkgs/development/python-modules/ld2410-ble/default.nix +++ b/pkgs/development/python-modules/ld2410-ble/default.nix @@ -1,11 +1,12 @@ { lib, async-timeout, - bleak, bleak-retry-connector, + bleak, buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -24,11 +25,6 @@ buildPythonPackage rec { hash = "sha256-wQnE2hNT0UOnPJbHq1eayIO8g0XRZvEH6V19DL6RqoA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -37,7 +33,10 @@ buildPythonPackage rec { bleak-retry-connector ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "ld2410_ble" ]; From 61f4b49af31f587682c05309d172b3ae1895da83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:16:46 +0100 Subject: [PATCH 067/136] python312Packages.moat-ble: refactor --- pkgs/development/python-modules/moat-ble/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix index 26058cb0577a..7e2c2b0fa2d1 100644 --- a/pkgs/development/python-modules/moat-ble/default.nix +++ b/pkgs/development/python-modules/moat-ble/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "moat-ble"; version = "0.1.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "moat-ble"; rev = "refs/tags/v${version}"; hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data @@ -45,7 +45,7 @@ buildPythonPackage rec { description = "Library for Moat BLE devices"; homepage = "https://github.com/Bluetooth-Devices/moat-ble"; changelog = "https://github.com/Bluetooth-Devices/moat-ble/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From fcd66de40572020e02a287c57acd8d95f58f4fb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:18:07 +0100 Subject: [PATCH 068/136] python312Packages.moat-ble: migrate to pytest-cov-stub --- pkgs/development/python-modules/moat-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/moat-ble/default.nix b/pkgs/development/python-modules/moat-ble/default.nix index 7e2c2b0fa2d1..fe8dbd54ca2a 100644 --- a/pkgs/development/python-modules/moat-ble/default.nix +++ b/pkgs/development/python-modules/moat-ble/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -32,12 +33,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=moat_ble --cov-report=term-missing:skip-covered" "" - ''; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "moat_ble" ]; From 99cced93d289d1475219dd5a97137d9d7d313e34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:27:13 +0100 Subject: [PATCH 069/136] python312Packages.mopeka-iot-ble: refactor --- .../development/python-modules/mopeka-iot-ble/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 8798668d6c28..96774a9bd9b8 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; - repo = pname; + repo = "mopeka-iot-ble"; rev = "refs/tags/v${version}"; hash = "sha256-CKLC0p66JapE9qNePE11ttoGMVd4kA7g28kA+pYLXCE="; }; @@ -30,9 +30,9 @@ buildPythonPackage rec { --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Library for Mopeka IoT BLE devices"; homepage = "https://github.com/bluetooth-devices/mopeka-iot-ble"; changelog = "https://github.com/Bluetooth-Devices/mopeka-iot-ble/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 343304f3d49db8062d067038d4819bdc54e19d12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:27:36 +0100 Subject: [PATCH 070/136] python312Packages.mopeka-iot-ble: migrate to pytest-cov-stub --- .../python-modules/mopeka-iot-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 96774a9bd9b8..9f8432f5689b 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -25,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-CKLC0p66JapE9qNePE11ttoGMVd4kA7g28kA+pYLXCE="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -39,7 +35,10 @@ buildPythonPackage rec { sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "mopeka_iot_ble" ]; From 7d56f84a0730640972c18946e9bb12a406c30374 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Dec 2024 13:33:16 +0100 Subject: [PATCH 071/136] python312Packages.airthings-ble: migrate to pytest-cov-stub --- .../python-modules/airthings-ble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 854ab37120a2..68249000984c 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -7,6 +7,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -25,11 +26,6 @@ buildPythonPackage rec { hash = "sha256-m2jsXLrj2yS2Wi2dSwyxBv/nXmU738gd5iJ1JVfakUg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" - ''; - build-system = [ poetry-core ]; dependencies = [ @@ -38,7 +34,10 @@ buildPythonPackage rec { bleak-retry-connector ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "airthings_ble" ]; From 81806e544faca8bb85bdfd79e8212a61709e0d58 Mon Sep 17 00:00:00 2001 From: Guy Boldon Date: Sun, 15 Dec 2024 13:49:33 +0100 Subject: [PATCH 072/136] coolercontrol.*: 1.4.4 -> 1.4.5 --- pkgs/applications/system/coolercontrol/coolercontrol-gui.nix | 2 +- .../system/coolercontrol/coolercontrol-ui-data.nix | 2 +- pkgs/applications/system/coolercontrol/coolercontrold.nix | 2 +- pkgs/applications/system/coolercontrol/default.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index f6f9c95c0e95..1f1fec06f319 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4="; + cargoHash = "sha256-gjR54dZjVonyznfBGb3iNNdmPalE+a53MmkOEZj3+sY="; buildFeatures = [ "custom-protocol" ]; diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index 6906769b44ad..19475bc7572e 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -11,7 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-j+bGOGIG9H/1z0dN8BfvWSi6gPvYmCV7l0ZNH8h3yeU="; + npmDepsHash = "sha256-t+QShKaXpQuEzeeu/ljBBEzeYsxqvMpx5waDZ2gyPAI="; preBuild = '' autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 76c42cf30039..ee9af95a0ddf 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/coolercontrold"; useFetchCargoVendor = true; - cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I="; + cargoHash = "sha256-5gqtSZs/unFobEl1MHec2uhGDrWnO6ITlYbB78VasZg="; buildInputs = [ libdrm ]; diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 89cb7f0e9c37..066be7abb8ff 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -5,13 +5,13 @@ }: let - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg="; + hash = "sha256-lRw5IcSrLM6aUajt2Ny1IUuGYcAjY1oUDZENyz0wVJI="; }; meta = { From d56c2fbb042bf4eb6cd39358bd48ed8cc52e4e36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 13:01:41 +0000 Subject: [PATCH 073/136] python312Packages.pdftotext: 2.2.2 -> 3.0.0 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index f16fd012e72c..a5d58d186fb8 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.2.2"; + version = "3.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "2a9aa89bc62022408781b39d188fabf5a3ad1103b6630f32c4e27e395f7966ee"; + sha256 = "sha256-w2UrGRVOFFUVqL+pU/xhNjOO2SM3vcy7U/4NiAE7Gqo="; }; buildInputs = [ poppler ]; From 006fe929737904c7b27b5c7fd5bad43e48760b4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Dec 2024 21:51:42 +0000 Subject: [PATCH 074/136] python312Packages.modbus-tk: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/modbus-tk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/modbus-tk/default.nix b/pkgs/development/python-modules/modbus-tk/default.nix index 5d82d3aec56c..d56deb1ff34d 100644 --- a/pkgs/development/python-modules/modbus-tk/default.nix +++ b/pkgs/development/python-modules/modbus-tk/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "modbus-tk"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "modbus_tk"; inherit version; - hash = "sha256-aQ+nu4bql4mSRl0tYci1rMY5zg6LgzoKqW1N0XLFZEo="; + hash = "sha256-aJd3ZusQRplz3VaigUvZgbhd0YC3kEMkh4bYgAjyWTs="; }; build-system = [ setuptools ]; @@ -29,10 +29,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "modbus_tk" ]; - meta = with lib; { + meta = { description = "Module for simple Modbus interactions"; homepage = "https://github.com/ljean/modbus-tk"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ fab ]; }; } From 074e802f39d9978a9f9db1dba9e9c6e196005aba Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 15 Dec 2024 16:56:38 +0100 Subject: [PATCH 075/136] k3s_1_28: remove EOL at 2024-10-28 --- .../cluster/k3s/1_28/chart-versions.nix | 10 ---------- .../cluster/k3s/1_28/images-versions.json | 18 ------------------ .../networking/cluster/k3s/1_28/versions.nix | 15 --------------- .../networking/cluster/k3s/default.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 6 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_28/images-versions.json delete mode 100644 pkgs/applications/networking/cluster/k3s/1_28/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix deleted file mode 100644 index 7f65917312ed..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz"; - sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz"; - sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json deleted file mode 100644 index 449fa538cbd3..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "airgap-images-amd64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "0p14llji8m1pfi289w29smx6sbad6qhgxk9drwlyrfdywrhd04ly" - }, - "airgap-images-arm": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "054apgl2al8822f399ir81jbid9mfs27d4by7xkkpdbqr3fywbr6" - }, - "airgap-images-arm64": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "19hzamg68zc1k90a9m6p2jnpy2p7v437kvgqsw198bhy796f6asb" - }, - "images-list": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-images.txt", - "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8" - } -} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix deleted file mode 100644 index e03aa9f0eaf6..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - k3sVersion = "1.28.15+k3s1"; - k3sCommit = "869dd4d62626f5ba4afe3a923d77b2047c565a43"; - k3sRepoSha256 = "1nijdii01004v2cgpaw0xnzyrljd4iw00wca1lg6szhqmj28gcfv"; - k3sVendorHash = "sha256-zWBMZrpRJzzc4yAIWAnWnmVE7qr7bscJjHrHdDD0Ilg="; - chartVersions = import ./chart-versions.nix; - imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.14.0"; - k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; - k3sCNIVersion = "1.5.1-k3s1"; - k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7"; - containerdVersion = "1.7.22-k3s1.28"; - containerdSha256 = "0jpq03n5q8aydw4y14w9fl4fqixpdcw42gwvmsp3z3qplbvwkfkl"; - criCtlVersion = "1.26.0-rc.0-k3s1"; -} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 59fd6b1be344..ac960f233907 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -12,17 +12,6 @@ let extraArgs = builtins.removeAttrs args [ "callPackage" ]; in { - # 1_28 can be built with the same builder as 1_30 - k3s_1_28 = common ( - (import ./1_28/versions.nix) - // { - updateScript = [ - ./update-script.sh - "28" - ]; - } - ) extraArgs; - # 1_29 can be built with the same builder as 1_30 k3s_1_29 = common ( (import ./1_29/versions.nix) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 115ad0035cb8..65b6a4bcec0c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -585,6 +585,7 @@ mapAliases { k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 + k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2ba978dc202..b49427424818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14417,7 +14417,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_28 k3s_1_29 k3s_1_30 k3s_1_31 From 06eba69511e8bf466b70dfd5ca3879e07f41e482 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 16:46:34 +0000 Subject: [PATCH 076/136] python312Packages.oauthenticator: 17.2.0 -> 17.3.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index ec3a2607fd6e..4a1b92734351 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "17.2.0"; + version = "17.3.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YovSUu5o4dJ2wO1hXEe6Hc0Mf7hIH24DefBi5JV3H6c="; + hash = "sha256-5dkMskEf/z3G/MFjNGgjPA4OAjlCLAh8dzTRaFBVuPM="; }; build-system = [ setuptools ]; From 09308da5f891fd914445f01a2b1ba5283f61a316 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 15 Dec 2024 18:29:39 +0100 Subject: [PATCH 077/136] oscavmgr: use fetchCargoVendor Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/os/oscavmgr/Cargo.lock | 2422 -------------------------- pkgs/by-name/os/oscavmgr/package.nix | 10 +- 2 files changed, 2 insertions(+), 2430 deletions(-) delete mode 100644 pkgs/by-name/os/oscavmgr/Cargo.lock diff --git a/pkgs/by-name/os/oscavmgr/Cargo.lock b/pkgs/by-name/os/oscavmgr/Cargo.lock deleted file mode 100644 index 53246c5f25ad..000000000000 --- a/pkgs/by-name/os/oscavmgr/Cargo.lock +++ /dev/null @@ -1,2422 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "alvr_common" -version = "20.11.1" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" -dependencies = [ - "anyhow", - "backtrace", - "glam", - "log", - "once_cell", - "parking_lot", - "paste", - "semver", - "serde", - "settings-schema", -] - -[[package]] -name = "alvr_events" -version = "20.11.1" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" -dependencies = [ - "alvr_common", - "alvr_packets", - "alvr_session", - "serde", - "serde_json", -] - -[[package]] -name = "alvr_filesystem" -version = "20.11.1" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" -dependencies = [ - "dirs", - "once_cell", -] - -[[package]] -name = "alvr_packets" -version = "20.11.1" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" -dependencies = [ - "alvr_common", - "alvr_session", - "serde", - "serde_json", -] - -[[package]] -name = "alvr_session" -version = "20.11.1" -source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30" -dependencies = [ - "alvr_common", - "alvr_filesystem", - "bytemuck", - "regex", - "serde", - "serde_json", - "settings-schema", -] - -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" -dependencies = [ - "anstyle", - "windows-sys 0.59.0", -] - -[[package]] -name = "anyhow" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" -dependencies = [ - "backtrace", -] - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" - -[[package]] -name = "cc" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width 0.1.14", - "windows-sys 0.52.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "errno" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "flume" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" -dependencies = [ - "futures-core", - "futures-sink", - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "glam" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677" -dependencies = [ - "mint", - "serde", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "http" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "if-addrs" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "indicatif" -version = "0.17.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width 0.2.0", - "web-time", -] - -[[package]] -name = "indicatif-log-bridge" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63703cf9069b85dbe6fe26e1c5230d013dee99d3559cd3d02ba39e099ef7ab02" -dependencies = [ - "indicatif", - "log", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "js-sys" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.168" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litemap" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "mdns-sd" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36e83ad165be7e0ad2e3ae3be9afffdda0c2c9a7e70c628e5541f11443e3041" -dependencies = [ - "fastrand", - "flume", - "if-addrs", - "log", - "polling", - "socket2", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mint" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.36.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" - -[[package]] -name = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "openxr" -version = "0.19.0" -source = "git+https://github.com/galister/openxrs#17642d0ccac65dbf7e24da84db56cc500592afff" -dependencies = [ - "libc", - "ndk-context", - "openxr-sys", -] - -[[package]] -name = "openxr-sys" -version = "0.11.0" -source = "git+https://github.com/galister/openxrs#17642d0ccac65dbf7e24da84db56cc500592afff" -dependencies = [ - "libc", - "mint", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "oscavmgr" -version = "0.4.3" -dependencies = [ - "alvr_common", - "alvr_events", - "anyhow", - "clap", - "colored", - "env_logger", - "glam", - "glob", - "indicatif", - "indicatif-log-bridge", - "log", - "mdns-sd", - "mint", - "once_cell", - "openxr", - "regex", - "reqwest", - "rosc", - "serde", - "serde_json", - "strum", - "sysinfo", - "tokio", - "websocket-lite", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - -[[package]] -name = "rosc" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e63d9e6b0d090be1485cf159b1e04c3973d2d3e1614963544ea2ff47a4a981" -dependencies = [ - "byteorder", - "nom", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustversion" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schannel" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.216" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.216" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.133" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "settings-schema" -version = "0.2.0" -source = "git+https://github.com/alvr-org/settings-schema-rs?rev=676185f#676185f35869f05a90fcc81f66a4bbd9d86f9c12" -dependencies = [ - "serde", - "serde_json", - "settings-schema-derive", -] - -[[package]] -name = "settings-schema-derive" -version = "0.2.0" -source = "git+https://github.com/alvr-org/settings-schema-rs?rev=676185f#676185f35869f05a90fcc81f66a4bbd9d86f9c12" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sysinfo" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948512566b1895f93b1592c7574baeb2de842f224f2aab158799ecadb8ebbb46" -dependencies = [ - "core-foundation-sys", - "libc", - "memchr", - "ntapi", - "rayon", - "windows", -] - -[[package]] -name = "tempfile" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tokio" -version = "1.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "unicode-ident" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "url" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" - -[[package]] -name = "web-sys" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "websocket-codec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2108c9c18a6e746addc085c18cedb66b672e8ffea6a993712decc295b0d8ae55" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "httparse", - "rand", - "sha1", - "tokio-util", -] - -[[package]] -name = "websocket-lite" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6cae39139c6e837afebd915935e7adc8af5c28425935de606d0e8c9d3268f6" -dependencies = [ - "base64 0.13.1", - "bytes", - "futures", - "native-tls", - "rand", - "tokio", - "tokio-native-tls", - "tokio-util", - "url", - "websocket-codec", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result 0.2.0", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix index eec53e7964c9..21a71ecbb42b 100644 --- a/pkgs/by-name/os/oscavmgr/package.nix +++ b/pkgs/by-name/os/oscavmgr/package.nix @@ -20,14 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-05dNBzf1f92bVNLbRaUB6KUae+wY3V8mUxDgAb+g1T4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "alvr_common-20.11.1" = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8="; - "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw="; - "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-fw26EbdCnz7KtDmCDpvfy4fjYORL2KcnhzQBJDdNEuI="; nativeBuildInputs = [ pkg-config From e84ca6928c9039b0e4e322ca9cb8529bff5d9d47 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:59:32 -0500 Subject: [PATCH 078/136] vscode-extensions.moshfeu.compare-folders: 0.24.3 -> 0.25.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d3b8c866366a..e0718a8c5e18 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3246,8 +3246,8 @@ let mktplcRef = { name = "compare-folders"; publisher = "moshfeu"; - version = "0.24.3"; - hash = "sha256-eaumF2BIqEYoyL7LQ0Wx3+gkkFGpWKQoN3AisI8wTQY="; + version = "0.25.1"; + hash = "sha256-axNTdnSkMkFs7LSZCc7VinjbrDncsRHlRtDG9+eh2qQ="; }; meta = { From b557ff784658874b814f4263df80f40c3411a88b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 18:50:23 +0000 Subject: [PATCH 079/136] python312Packages.mailchecker: 6.0.13 -> 6.0.14 --- pkgs/development/python-modules/mailchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 5d11aeb2bbb7..c105952bf3a8 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.13"; + version = "6.0.14"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-03Qew5vfLGkUFNw2Hg1nLwjiCkTXDNJy/QfiWc/bhjU="; + hash = "sha256-/FZwGXQwx46r1koP20LSRXxcqVQCEMWhkT2XlXhtKn0="; }; build-system = [ setuptools ]; From 3fde6f91dbd54a4b18d8906eea6c382e29d916f4 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 15 Dec 2024 10:57:16 -0800 Subject: [PATCH 080/136] bant: 0.1.8 -> 0.1.9 --- pkgs/by-name/ba/bant/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 3ad49af6b1ad..daad4e7b0b2d 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -19,13 +19,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-CMqh2v6Y/jvrDC2M4Q+pC0FkNJ95gbGTR1UC6zviwV4="; + hash = "sha256-TIVbf5qZNohZAFugi/E7m1Sgekn82/qqtx8jSHo75Js="; }; bazelFlags = [ @@ -40,8 +40,8 @@ buildBazelPackage rec { fetchAttrs = { hash = { - aarch64-linux = "sha256-2QMg/Ko3HgqKhI2g4PZ+UWOujDACLZHxyec1zAm58yg="; - x86_64-linux = "sha256-SfQ6dlC+JVYXIpuvMNyQJkY6+zq8Md2+LsiRstJWMdY="; + aarch64-linux = "sha256-8pLgn67kwVNdqhUXYsdi7OsArCZZmW55UPzUBlIyBbk="; + x86_64-linux = "sha256-dUNdvSJA3SlIIRWmhaq3Hu0+84mBBhxbU/eBDXIv/iI="; } .${system} or (throw "No hash for system: ${system}"); }; From f709c6b913715c81755f805815e81601ee4f8b97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 20:05:36 +0000 Subject: [PATCH 081/136] python312Packages.xarray-dataclasses: 1.8.0 -> 1.9.1 --- .../python-modules/xarray-dataclasses/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xarray-dataclasses/default.nix b/pkgs/development/python-modules/xarray-dataclasses/default.nix index 09205ea9e177..9dcbfd001c77 100644 --- a/pkgs/development/python-modules/xarray-dataclasses/default.nix +++ b/pkgs/development/python-modules/xarray-dataclasses/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xarray-dataclasses"; - version = "1.8.0"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "astropenguin"; repo = "xarray-dataclasses"; - rev = "refs/tags/v${version}"; - hash = "sha256-NZBWq1G63yef6h9TjRBfCqPzhaks0Cm7bUCJfIIpmcE="; + tag = "v${version}"; + hash = "sha256-p9xV9Mpk5fsWR8X6VWNaeRi66OqK4QQWA8pwD2aYqOU="; }; nativeBuildInputs = [ From 7690522998850db15c5f65cc5314f3a1eb6cbb32 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sun, 15 Dec 2024 13:44:24 -0800 Subject: [PATCH 082/136] boxes: drop gccStdenv boxes compiles and runs fine with clang so no need to pin to gcc --- pkgs/by-name/bo/boxes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxes/package.nix b/pkgs/by-name/bo/boxes/package.nix index fcbdaf627789..476eae96fe76 100644 --- a/pkgs/by-name/bo/boxes/package.nix +++ b/pkgs/by-name/bo/boxes/package.nix @@ -1,6 +1,6 @@ { lib, - gccStdenv, + stdenv, fetchFromGitHub, bison, flex, @@ -9,7 +9,7 @@ ncurses, }: -gccStdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "boxes"; version = "2.3.1"; @@ -43,7 +43,7 @@ gccStdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = [ "CC=${gccStdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 -t $out/bin out/boxes From 2f5626a46b8d79c32c7ffcb595edf120dcf39eb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 22:42:45 +0000 Subject: [PATCH 083/136] python312Packages.types-awscrt: 0.23.3 -> 0.23.4 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index c1f4dd5c1661..9ecb88d1e82c 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.23.3"; + version = "0.23.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-BDwK4P5dJyYYKUy+rxw0mmVKn3wAEhvmTSdIaTOsSiY="; + hash = "sha256-sbm7EPM34/6PX1CIYOs1TZ/gk/AuFIWVWp4L3U4lAHQ="; }; build-system = [ setuptools ]; From f1fb86cc6f9ce7ff346cd061d22343955aea449a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 15 Dec 2024 23:58:12 +0100 Subject: [PATCH 084/136] haskellPackages.HsOpenSSL: work around -Werror failures See the linked issues. Probably due to gcc >= 14. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3accbb7d44a5..8c4607814569 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -240,6 +240,14 @@ self: super: { ]; }) super.statistics; + # Work around -Werror failures until a more permanent solution is released + # https://github.com/haskell-cryptography/HsOpenSSL/issues/88 + # https://github.com/haskell-cryptography/HsOpenSSL/issues/93 + # https://github.com/haskell-cryptography/HsOpenSSL/issues/95 + HsOpenSSL = appendConfigureFlags [ + "--ghc-option=-optc=-Wno-incompatible-pointer-types" + ] super.HsOpenSSL; + # There are numerical tests on random data, that may fail occasionally lapack = dontCheck super.lapack; From 453c8f73490c4d0f4b4ca686d0fe00298a32e5c4 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 7 Oct 2024 16:04:14 +0200 Subject: [PATCH 085/136] nixos-rebuild: add build-image... a new sub-command to build disk-images specialized for various platforms and providers in system.build.images via the command line. `nixos-rebuild build-image --flake .#my-test-vm` exits with an error and prints a list of supported images. Add `--image-variant` to select an image, e.g.: `nixos-rebuild build-image --flake .#my-test-vm --image-variant proxmox`. --- .../linux/nixos-rebuild/nixos-rebuild.8 | 20 ++++++- .../linux/nixos-rebuild/nixos-rebuild.sh | 53 ++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 25ae9efba1c7..a66f27892a1a 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -10,7 +10,7 @@ .Sh SYNOPSIS .Nm .Bro -.Cm switch | boot | test | build | dry-build | dry-activate | edit | repl | build-vm | build-vm-with-bootloader | list-generations Op Fl -json +.Cm switch | boot | test | build | dry-build | dry-activate | edit | repl | build-vm | build-vm-with-bootloader | build-image | list-generations Op Fl -json .Brc .br .Op Fl -upgrade | -upgrade-all @@ -34,6 +34,8 @@ .Op Fl -profile-name | p Ar name .Op Fl -specialisation | c Ar name .br +.Op Fl -image-variant Ar variant +.br .Op Fl -build-host Va host .Op Fl -target-host Va host .Op Fl -use-remote-sudo @@ -226,6 +228,16 @@ containing a .Pa /boot partition. . +.It Cm build-image +Build a disk-image variant, pre-configured for the given platform/provider. +Select a variant with the +.Fl --image-variant +option or run without any options to get a list of available variants. + +.Bd -literal -offset indent +$ nixos-rebuild build-image --image-variant proxmox +.Ed +. .It Cm list-generations Op Fl -json List the available generations in a similar manner to the boot loader menu. It shows the generation number, build date and time, NixOS version, @@ -323,6 +335,12 @@ The new configuration will appear in the GRUB 2 submenu Activates given specialisation; when not specified, switching and testing will activate the base, unspecialised system. . +.It Fl -image-variant Ar variant +Selects an image variant to build from +the +.Va config.system.build.images +attribute of the given configuration. A list of variants is printed if this option remains unset. +. .It Fl -build-host Ar host Instead of building the new configuration locally, use the specified host to perform the build. The host needs to be accessible with diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 9e4fde59172c..864b20c25221 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -29,6 +29,7 @@ upgrade= upgrade_all= profile=/nix/var/nix/profiles/system specialisation= +imageVariant= buildHost= targetHost= remoteSudo= @@ -52,7 +53,7 @@ while [ "$#" -gt 0 ]; do --help) showSyntax ;; - switch|boot|test|build|edit|repl|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader|list-generations) + switch|boot|test|build|edit|repl|dry-build|dry-run|dry-activate|build-vm|build-vm-with-bootloader|build-image|list-generations) if [ "$i" = dry-run ]; then i=dry-build; fi if [ "$i" = list-generations ]; then buildNix= @@ -153,6 +154,14 @@ while [ "$#" -gt 0 ]; do specialisation="$1" shift 1 ;; + --image-variant) + if [ -z "$1" ]; then + log "$0: ‘--image-variant’ requires an argument" + exit 1 + fi + imageVariant="$1" + shift 1 + ;; --build-host) buildHost="$1" shift 1 @@ -819,6 +828,43 @@ if [ -z "$rollback" ]; then else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi + elif [ "$action" = build-image ]; then + if [[ -z $buildingAttribute ]]; then + variants="$( + runCmd nix-instantiate --eval --strict --json --expr \ + "let + value = import \"$(realpath $buildFile)\"; + set = if builtins.isFunction value then value {} else value; + in builtins.mapAttrs (n: v: v.passthru.filePath) set.${attr:+$attr.}config.system.build.images" \ + "${extraBuildFlags[@]}" + )" + elif [[ -z $flake ]]; then + variants="$( + runCmd nix-instantiate --eval --strict --json --expr \ + "with import {}; builtins.mapAttrs (n: v: v.passthru.filePath) config.system.build.images" \ + "${extraBuildFlags[@]}" + )" + else + variants="$( + runCmd nix "${flakeFlags[@]}" eval --json \ + "$flake#$flakeAttr.config.system.build.images" \ + --apply "builtins.mapAttrs (n: v: v.passthru.filePath)" "${evalArgs[@]}" "${extraBuildFlags[@]}" + )" + fi + if ! echo "$variants" | jq -e --arg variant "$imageVariant" "keys | any(. == \$variant)" > /dev/null; then + echo -e "Please specify one of the following supported image variants via --image-variant:\n" >&2 + echo "$variants" | jq -r '. | keys | join ("\n")' + exit 1 + fi + imageName="$(echo "$variants" | jq -r --arg variant "$imageVariant" ".[\$variant]")" + + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.images.${imageVariant}" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then + pathToConfig="$(nixBuild '' -A config.system.build.images.${imageVariant} -k "${extraBuildFlags[@]}")" + else + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.images.${imageVariant}" "${extraBuildFlags[@]}" "${lockFlags[@]}")" + fi else showSyntax fi @@ -913,3 +959,8 @@ if [[ "$action" = build-vm || "$action" = build-vm-with-bootloader ]]; then Done. The virtual machine can be started by running $(echo "${pathToConfig}/bin/"run-*-vm) EOF fi + +if [[ "$action" = build-image ]]; then + echo -n "Done. The disk image can be found in " >&2 + echo "${pathToConfig}/${imageName}" +fi From 44520c1a05763e988d913744f8844147b6af3c40 Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 18 Nov 2024 11:45:43 +0100 Subject: [PATCH 086/136] amazon-image: update nixos-generators reference in README.md --- nixos/maintainers/scripts/ec2/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/README.md b/nixos/maintainers/scripts/ec2/README.md index eb2c9088d5a2..575b13e88a1c 100644 --- a/nixos/maintainers/scripts/ec2/README.md +++ b/nixos/maintainers/scripts/ec2/README.md @@ -18,10 +18,10 @@ nix run nixpkgs#upload-ami -- --image-info ./result/nix-support/image-info.json ## How to build your own NixOS config into an AMI -I suggest looking at https://github.com/nix-community/nixos-generators for a user-friendly interface. +Use `nixos-rebuild build-image` as follows: ```bash -nixos-generate -c ./my-config.nix -f amazon +NIXOS_CONFIG="$(pwd)/my-config.nix" nixos-rebuild build-image --image-variant amazon export AWS_REGION=us-west-2 export AWS_PROFILE=my-profile From 4bbb4e5db12d9119912aa38791cec1bd145c1ecd Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 26 Nov 2024 11:04:24 +0100 Subject: [PATCH 087/136] manual/installation: fix installer iso filename Changed due to introduction of image.baseName for isoImage, but it seems like it was "nixos.iso" instead of "cd.iso" before anyway? --- nixos/doc/manual/installation/building-nixos.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md index 7b0b5ea1c447..3ae951916849 100644 --- a/nixos/doc/manual/installation/building-nixos.chapter.md +++ b/nixos/doc/manual/installation/building-nixos.chapter.md @@ -30,7 +30,7 @@ $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd To check the content of an ISO image, mount it like so: ```ShellSession -# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso +# mount -o loop -t iso9660 ./result/iso/nixos-image-25.05pre-git-x86_64-linux.iso /mnt/iso ``` ## Additional drivers or firmware {#sec-building-image-drivers} From 1d0a29c2797a94c19448f94490dce9817c43a646 Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 26 Nov 2024 12:20:22 +0100 Subject: [PATCH 088/136] manual: Add nixos-rebuild build image release note entry --- .../manual/release-notes/rl-2505.section.md | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1b33e663a98d..595b6af0e339 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -8,6 +8,10 @@ - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. +- A `nixos-rebuild build-image` sub-command has been added. + + It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). + ## New Modules {#sec-release-25.05-new-modules} @@ -132,6 +136,32 @@ - `python3Packages.opentracing` has been removed due to being unmaintained upstream. [OpenTelemetry](https://opentelemetry.io/) is the recommended replacement. +- Default file names of images generated by several builders in `system.build` have been changed as outlined in the table below. + + Names are now known at evaluation time and customizable via the new options `image.baseName`, `image.extension`, `image.fileName` and `image.filePath` with the latter returning a path relative to the derivations out path (e.g. `iso/${image.fileName` for iso images). + + | `system.build` Option | Old Filename | New Filename | + |--------------------------+------------------------------------------------------------+-----------------------------------------------------------------| + | amazonImage | nixos-amazon-image-25.05pre-git-x86_64-linux.vhd | nixos-image-amazon-25.05pre-git-x86_64-linux.vhd | + | azureImage | disk.vhd | nixos-image-azure-25.05pre-git-x86_64-linux.vhd | + | digitalOceanImage | nixos.qcow2.gz | nixos-image-digital-ocean-25.05pre-git-x86_64-linux.qcow2.gz | + | googleComputeImage | nixos-image-25.05pre-git-x86_64-linux.raw.tar.gz | nixos-image-google-compute-25.05pre-git-x86_64-linux.raw.tar.gz | + | hypervImage | nixos-25.05pre-git-x86_64-linux.vhdx | nixos-image-hyperv-25.05pre-git-x86_64-linux.vhdx | + | isoImage (installer) | nixos-25.05pre-git-x86_64-linux.iso | nixos-image-25.05pre-git-x86_64-linux.iso | + | isoImage | nixos.iso | nixos-image-25.05pre-git-x86_64-linux.iso | + | kubevirtImage | nixos.qcow2 | nixos-image-kubevirt-25.05pre-git-x86_64-linux.qcow2 | + | linodeImage | nixos-image-25.05pre-git-x86_64-linux.img.gz | nixos-image-linode-25.05pre-git-x86_64-linux.img.gz | + | metadata (lxc-container) | nixos-system-x86_64-linux.tar.xz | nixos-image-lxc-metadata-25.05pre-git-x86_64-linux.tar.xz | + | OCIImage | nixos.qcow2 | nixos-image-oci-25.05pre-git-x86_64-linux.qcow2 | + | openstackImage (zfs) | nixos-openstack-image-25.05pre-git-x86_64-linux.root.qcow2 | nixos-image-openstack-zfs-25.05pre-git-x86_64-linux.root.qcow2 | + | openstackImage | nixos.qcow2 | nixos-image-openstack-25.05pre-git-x86_64-linux.qcow2 | + | sdImage | nixos-sd-image-25.05pre-git-x86_64-linux.img.zst | nixos-image-sd-card-25.05pre-git-x86_64-linux.img.zst | + | tarball (lxc-container) | nixos-system-x86_64-linux.tar.xz | nixos-image-lxc-25.05pre-git-x86_64-linux.tar.xz | + | tarball (proxmox-lxc) | nixos-system-x86_64-linux.tar.xz | nixos-image-lxc-proxmox-25.05pre-git-x86_64-linux.tar.xz | + | vagrantVirtualbox | nixos-25.05pre-git-x86_64-linux.ova | nixos-image-virtualbox-25.05pre-git-x86_64-linux.ova | + | virtualBoxOVA | virtualbox-vagrant.box | nixos-image-vagrant-virtualbox-25.05pre-git-x86_64-linux.ova | + | vmwareImage | nixos-25.05pre-git-x86_64-linux.vmdk | nixos-image-vmware-25.05pre-git-x86_64-linux.vmdk | + - the notmuch vim plugin now lives in a separate output of the `notmuch` package. Installing `notmuch` will not bring the notmuch vim package anymore, add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the From b79f1c3c99ff1a93a3e87623d0503cf7f653e9b5 Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 26 Nov 2024 12:21:05 +0100 Subject: [PATCH 089/136] manual: add nixos-rebuild build-image section --- ...ages-via-nixos-rebuild-build-image.chapter.md | 16 ++++++++++++++++ .../installation/building-nixos.chapter.md | 4 +--- nixos/doc/manual/installation/installation.md | 1 + nixos/doc/manual/redirects.json | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md diff --git a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md new file mode 100644 index 000000000000..378b1163a6e3 --- /dev/null +++ b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md @@ -0,0 +1,16 @@ +# Building Images with `nixos-rebuild build-image` {#sec-image-nixos-rebuild-build-image} + +Nixpkgs contains a variety of modules to build custom images for different virtualization platforms and cloud providers, such as e.g. `amazon-image.nix` and `proxmox-lxc.nix`. + +While those can be imported individually, `system.build.images` provides an attribute set mapping variant names to image derivations. Available variants are defined - end extendable - in `image.modules`, an attribute set mapping variant names to a list of NixOS modules. + +All of those images can be built via both, their `system.build.image` attribute, and the CLI `nixos-rebuild build-image`. To build i.e. an Amazon image from your existing NixOS configuration: + +```ShellSession +$ nixos-rebuild build-image --image-variant amazon +$ ls result +nixos-image-amazon-25.05pre-git-x86_64-linux.vhd nix-support +``` + +To get a list of all variants available, run `nixos-rebuild build-image` without arguments. + diff --git a/nixos/doc/manual/installation/building-nixos.chapter.md b/nixos/doc/manual/installation/building-nixos.chapter.md index 3ae951916849..2b4dba57c10f 100644 --- a/nixos/doc/manual/installation/building-nixos.chapter.md +++ b/nixos/doc/manual/installation/building-nixos.chapter.md @@ -1,7 +1,7 @@ # Building a NixOS (Live) ISO {#sec-building-image} Default live installer configurations are available inside `nixos/modules/installer/cd-dvd`. -For building other system images, [nixos-generators] is a good place to start looking at. +For building other system images, see [Building Images with `nixos-rebuild build-image`](#sec-image-nixos-rebuild-build-image). You have two options: @@ -14,8 +14,6 @@ on which they immediately depend in order to work correctly. However, if you are confident, you can opt to override those enforced values with `mkForce`. -[nixos-generators]: https://github.com/nix-community/nixos-generators - ## Practical Instructions {#sec-building-image-instructions} To build an ISO image for the channel `nixos-unstable`: diff --git a/nixos/doc/manual/installation/installation.md b/nixos/doc/manual/installation/installation.md index f3b1773d865c..04bad5be1d46 100644 --- a/nixos/doc/manual/installation/installation.md +++ b/nixos/doc/manual/installation/installation.md @@ -8,5 +8,6 @@ installing.chapter.md changing-config.chapter.md upgrading.chapter.md building-nixos.chapter.md +building-images-via-nixos-rebuild-build-image.chapter.md building-images-via-systemd-repart.chapter.md ``` diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index f792750a1ea4..428dbdcc54c2 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -167,6 +167,9 @@ "sec-building-image-tech-notes": [ "index.html#sec-building-image-tech-notes" ], + "sec-image-nixos-rebuild-build-image": [ + "index.html#sec-image-nixos-rebuild-build-image" + ], "sec-image-repart": [ "index.html#sec-image-repart" ], From e069168756a57500d2aeb5fb431bbcbc894ec709 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 00:39:52 +0000 Subject: [PATCH 090/136] dita-ot: 4.2.3 -> 4.2.4 --- pkgs/by-name/di/dita-ot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix index a1e8931eacf3..6f9cabfea4b4 100644 --- a/pkgs/by-name/di/dita-ot/package.nix +++ b/pkgs/by-name/di/dita-ot/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dita-ot"; - version = "4.2.3"; + version = "4.2.4"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ openjdk17 ]; src = fetchzip { url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip"; - hash = "sha256-siHz81OuKVF77NsDpldAhq7YxzBFvo9RwGPe/mqkquQ="; + hash = "sha256-XAuqW4crJldkVJaW/tF7m/nnpV86z78d456/1hwLdU0="; }; installPhase = '' From 0a937c61ca6cecb6cf12073dadbde993466c13a1 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 15 Dec 2024 16:59:09 -0800 Subject: [PATCH 091/136] cosmic-wallpapers: 1.0.0-alpha.3 -> 1.0.0-alpha.4 --- pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 50b7a15ba526..26c64b5f5738 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.3"; + version = "1.0.0-alpha.4"; src = fetchFromGitHub { owner = "pop-os"; From ee97bfa67158f215ae38487826e6dea16ef2b763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 01:10:58 +0000 Subject: [PATCH 092/136] prometheus-redis-exporter: 1.66.0 -> 1.67.0 --- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 6f1ed7ef5cf1..a6492ff3fd96 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.66.0"; + version = "1.67.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-y+SZedMYxO0AMSjA5sCz9ynY1N537PCJ8LT3Mx1N4eA="; + sha256 = "sha256-CaiqX6GVDZYI/sJi2EbxspSf0cpRJ0R+aGFZADQMuWk="; }; vendorHash = "sha256-b3rvF91f/JoAAY6vut+NUCbuQAf2XsQn/n5mVLPnIoU="; From d3a9ef00e24db093d19e42ed896d2a2ddbb730e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 01:35:24 +0000 Subject: [PATCH 093/136] eask-cli: 0.10.1 -> 0.10.2 --- pkgs/by-name/ea/eask-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index d6f2567c007f..ea70b29d4de7 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-FgmeAsqbnlw7yOMslAJnZWuG3nDDjcXlS2pI3X9x1PA="; + hash = "sha256-G6bJoNKEz0Lpp3vfJJ86r942dWdMhQLJn10YXjUKJtI="; }; - npmDepsHash = "sha256-IgL58W4j3xbtVpGz316DpnYPyZD5dmDvg7Z1Irr3jig="; + npmDepsHash = "sha256-xZBnjhLHceLvYD9uPz5G9EupBBUAkBghxo5au0GxdWg="; dontBuild = true; From 86f3ef440bf880faeabe1978b968fbc61f46b074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 01:55:02 +0000 Subject: [PATCH 094/136] kubernetes-helmPlugins.helm-dt: 0.4.1 -> 0.4.3 --- .../networking/cluster/helm/plugins/helm-dt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index a3ad03a49344..024e3b067a85 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "helm-dt"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; rev = "refs/tags/v${version}"; - hash = "sha256-KrQAlB0ORNzKIG2vxych3gVBytTh3Hhnjsyn1ia1ZQM="; + hash = "sha256-m+XTR+LYTXeDTqo/deFAIQjbUqGn6yD/n5cQvJ+jKPc="; }; - vendorHash = "sha256-T8Kk+9NAhYOvSq94HOEE53BT7Xh9tU1gJ420o/tiVEo="; + vendorHash = "sha256-rovAY4G4ew6JhehyXMz7cDKSEsHu0IQwaNYvClDog2s="; ldflags = [ "-s" From 612df350a86d43d59967b263be41e7a6054bf2c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 02:09:03 +0000 Subject: [PATCH 095/136] nfs-ganesha: 6.3 -> 6.4 --- pkgs/by-name/nf/nfs-ganesha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 5d34e652fb22..5eed1a97db4f 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "6.3"; + version = "6.4"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - hash = "sha256-4gPhmBC42uCcaEhdJj9ZWw4ECB9UYwP+c2ndBFbBK0k="; + hash = "sha256-iT/6p4T4xrGsK2zBs5TDfEIhcCwNfUalQFLlCOODp24="; }; preConfigure = "cd src"; From 0f0d337d57b5c5614a8e48dbac56e1df6187f3e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 02:21:10 +0000 Subject: [PATCH 096/136] pmix: 5.0.4 -> 5.0.5 --- pkgs/by-name/pm/pmix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmix/package.nix b/pkgs/by-name/pm/pmix/package.nix index c28eaf0686fd..f461a954906a 100644 --- a/pkgs/by-name/pm/pmix/package.nix +++ b/pkgs/by-name/pm/pmix/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pmix"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${finalAttrs.version}"; - hash = "sha256-QsJm+4GnV5qrXVG3AwQxWas51AHcqycKjTpSG2/oOGU="; + hash = "sha256-iyvD6uR+kHAs5uLD3NPBVSQUslAsH40dwtszhAsJvqw="; fetchSubmodules = true; }; From 763d3a16e52420b6ba5f3359b2e8f1998b8c55c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 02:22:42 +0000 Subject: [PATCH 097/136] prrte: 3.0.7 -> 3.0.8 --- pkgs/by-name/pr/prrte/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 44f8fba390ae..980b4d889d43 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "prrte"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "openpmix"; repo = "prrte"; rev = "v${version}"; - hash = "sha256-Jw9/M2rpGTA19qssDaZV+9FYlIvz8wgL5oUDdWwidHI="; + hash = "sha256-4Xc6We0mXpKCwfHlmqi+WbFjdQegWHGzWrEnMVqkqtU="; fetchSubmodules = true; }; From 7520d4f15097480518bdafaf8680d639a8f1deef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 04:36:50 +0000 Subject: [PATCH 098/136] stylance-cli: 0.5.2 -> 0.5.3 --- pkgs/by-name/st/stylance-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index ba099d5aabfb..c6d6d82c827d 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.5.2"; + version = "0.5.3"; src = fetchCrate { inherit pname version; - hash = "sha256-2RLdO2TxIa/ngji5tzKzSfpq2qErI7gaQqObDTMrd/g="; + hash = "sha256-YN7Y8dxwpZel1SeEgyckh4ZPuRqcAsNvc/fGRgvzeDw="; }; - cargoHash = "sha256-26EKLvqc9x7JT6EDkH9KbQJ+xX/CUslLmEF4XxnPbFY="; + cargoHash = "sha256-VKfQzsTTKIbh+X0suXyUXDsd8sDSRsc5SnO8qxcxGPQ="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; From 9abf89372cdc97679ee2487eecd76ae9749298c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 04:45:32 +0000 Subject: [PATCH 099/136] watchexec: 2.2.0 -> 2.2.1 --- pkgs/tools/misc/watchexec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index c4597d54c41d..c8a51356f015 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-kbcSm1plh5QS87hGQj9OL1rq2eK6jbGn/kfjPF6kNzo="; + hash = "sha256-wm3zse5VqUNZ5d6ksCXXrngCcwrAniQbQqx9MOJoK58="; }; - cargoHash = "sha256-xLUI7B7clpdJQOMDd32ag87yQ99XgbLgPqahPwUHMZQ="; + cargoHash = "sha256-92lvMka6IqzNAxvYSMUeiDfYw4uKZjjpkZOABq9Mypo="; nativeBuildInputs = [ installShellFiles ]; From d1f3fafc1d084d99caca9a68afd5a0f44cdeaadc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 04:56:02 +0000 Subject: [PATCH 100/136] xed-editor: 3.6.9 -> 3.8.1 --- pkgs/by-name/xe/xed-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix index ac50149c8ad1..c6a5d9d97d16 100644 --- a/pkgs/by-name/xe/xed-editor/package.nix +++ b/pkgs/by-name/xe/xed-editor/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.9"; + version = "3.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - hash = "sha256-QPP7LWAiyKt7YBX88qlLS7PucQODH/c/j5WAbO9SF6k="; + hash = "sha256-q6lhgax3W51rtgmmROcrzxgaxz5J9r7CcPwhYDt/A5Y="; }; patches = [ From 509652f8dbdcd5abc0f3dd3c205eaf2fbe54f620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 15 Dec 2024 22:07:57 -0800 Subject: [PATCH 101/136] matio: refactor --- pkgs/by-name/ma/matio/package.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ma/matio/package.nix b/pkgs/by-name/ma/matio/package.nix index e440b6626a80..7b4953064e8e 100644 --- a/pkgs/by-name/ma/matio/package.nix +++ b/pkgs/by-name/ma/matio/package.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +{ + fetchurl, + lib, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { pname = "matio"; version = "1.5.28"; + src = fetchurl { - url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-naaYk0ohVprwWOY0hWRmb0UCnmwrCHjKDY+WCb93uNg="; + url = "mirror://sourceforge/matio/matio-${finalAttrs.version}.tar.gz"; + hash = "sha256-naaYk0ohVprwWOY0hWRmb0UCnmwrCHjKDY+WCb93uNg="; }; - meta = with lib; { + meta = { + changelog = "https://sourceforge.net/p/matio/news/"; description = "C library for reading and writing Matlab MAT files"; homepage = "http://matio.sourceforge.net/"; - license = licenses.bsd2; + license = lib.licenses.bsd2; maintainers = [ ]; mainProgram = "matdump"; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From 2c8e6aef5b03d96266356e2a77fed6414452c797 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 8 Dec 2024 21:11:19 +0100 Subject: [PATCH 102/136] ocamlPackages.melange: disable checks & disable for OCaml 5.0 --- pkgs/development/tools/ocaml/melange/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/melange/default.nix b/pkgs/development/tools/ocaml/melange/default.nix index c81ca2a6cf56..98f503d2e13e 100644 --- a/pkgs/development/tools/ocaml/melange/default.nix +++ b/pkgs/development/tools/ocaml/melange/default.nix @@ -31,6 +31,8 @@ let version = "4.0.0-51"; hash = "sha256-940Yzp1ZXnN6mKVWY+nqKjn4qtBUJR5eHE55OTjGvdU="; } + else if lib.versionAtLeast ocaml.version "5.0" then + throw "melange is not available for OCaml ${ocaml.version}" else { version = "4.0.0-414"; @@ -57,7 +59,7 @@ buildDunePackage { menhirLib ppxlib ]; - doCheck = true; + doCheck = false; nativeCheckInputs = [ jq merlin From a5731428c05158fbe6b475b51a4d708b0b493719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 07:45:47 +0000 Subject: [PATCH 103/136] python312Packages.incomfort-client: 0.6.3-1 -> 0.6.4 --- .../development/python-modules/incomfort-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index 7af06bcc0368..414aa327007f 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "incomfort-client"; - version = "0.6.3-1"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zxdavb"; repo = "incomfort-client"; - rev = "refs/tags/v${version}"; - hash = "sha256-I6MAFvODkw2QadzXJacFl/TwA6exfBB1PSDslmT7Ysw="; + tag = "v${version}"; + hash = "sha256-fyQKkwHQEvRNTh1IBqE0/YSskBfrFEequ+VxoHSeShA="; }; build-system = [ setuptools ]; From c3478c0c316154521dcf25f330812ce0d4611c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 07:50:40 +0000 Subject: [PATCH 104/136] python312Packages.okta: 2.9.8 -> 2.9.9 --- pkgs/development/python-modules/okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index dc75dfd84b56..87bbf82c11b7 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.8"; + version = "2.9.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RDnRiPsc4p5yI9jFzOtRI+r00tvska8x4uCSjl+cWvo="; + hash = "sha256-RgB1trUSAxrCpGJxyLt6lzQXHcVPVnqIUacynalUUzY="; }; pythonRelaxDeps = [ "aenum" ]; From 3348c124967b37408156b5f04c280319b68cb6fd Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 16 Dec 2024 03:29:44 +0000 Subject: [PATCH 105/136] lirc: fix build on ubuntu autoconf looks in /proc/version for `Ubuntu` and on match overrides the `--with-systemdsystemunitdir` value set in `configureFlags` causing the build to fail. > mkdir -p '/lib/systemd/system' > mkdir: cannot create directory '/lib': Permission denied patch `configure.ac` to prevent the override when building on ubuntu --- pkgs/by-name/li/lirc/package.nix | 5 +++++ pkgs/by-name/li/lirc/ubuntu.diff | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/by-name/li/lirc/ubuntu.diff diff --git a/pkgs/by-name/li/lirc/package.nix b/pkgs/by-name/li/lirc/package.nix index 69cc919a8d00..3ea393f77409 100644 --- a/pkgs/by-name/li/lirc/package.nix +++ b/pkgs/by-name/li/lirc/package.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { # Add a workaround for linux-headers-5.18 until upstream adapts: # https://sourceforge.net/p/lirc/git/merge-requests/45/ ./linux-headers-5.18.patch + + # remove check for `Ubuntu` in /proc/version which will override + # --with-systemdsystemunitdir + # https://sourceforge.net/p/lirc/tickets/385/ + ./ubuntu.diff ]; postPatch = '' diff --git a/pkgs/by-name/li/lirc/ubuntu.diff b/pkgs/by-name/li/lirc/ubuntu.diff new file mode 100644 index 000000000000..ff5cf048f85f --- /dev/null +++ b/pkgs/by-name/li/lirc/ubuntu.diff @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index d28c673..1cd0548 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -434,16 +434,7 @@ AC_CHECK_LIB([udev], [udev_device_new_from_device_id], [ + LIBS="$LIBS $LIBUDEV_LIBS" + ]) + +-dnl Ubuntu's systemd pkg-config seems broken beyond repair. So: +-kernelversion=`cat /proc/version || echo "non-linux"` +-AS_CASE([$kernelversion], +- [*Ubuntu*],[ +- AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup]) +- AC_SUBST([systemdsystemunitdir], [/lib/systemd/system]) +- AM_CONDITIONAL([WITH_SYSTEMDSYSTEMUNITDIR], [true]) +- ],[*],[ +- SYSTEMD_SYSTEMUNITDIR +-]) ++SYSTEMD_SYSTEMUNITDIR + + AC_ARG_WITH(lockdir, + [ --with-lockdir=DIR Old-school device lock files in DIR (/var/lock{/lockdev})], From 72768f674f7e0aae458a17714ab802ebfd1a2491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 08:00:43 +0000 Subject: [PATCH 106/136] python312Packages.proxmoxer: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/proxmoxer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 8f3ff8621fc8..957d3ce1aab3 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - rev = "refs/tags/${version}"; - hash = "sha256-bwNv9eBuatMAWZ/ZOoF4VUZFIYAxJDEEwGQaAwPWcHY="; + tag = version; + hash = "sha256-56PccWOZiYLPSaJrFfOqP9kTuHqqhgiF1DpnNgFSabI="; }; build-system = [ setuptools ]; From ace2b4c26060a86be0b38268acea8cf54613073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 16 Dec 2024 08:59:58 +0100 Subject: [PATCH 107/136] nixos/firmware: fix compression condition --- nixos/modules/services/hardware/udev.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index b0c68c41cd1c..0d6c78cf29c4 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -162,7 +162,7 @@ let ''; compressFirmware = firmware: - if config.hardware.firmwareCompression == "none" || (firmware.compressFirmware or false) == false then firmware + if config.hardware.firmwareCompression == "none" || (firmware.compressFirmware or true) == false then firmware else if config.hardware.firmwareCompression == "zstd" then pkgs.compressFirmwareZstd firmware else pkgs.compressFirmwareXz firmware; From b046eab687f7a3fe41b3cba00b783b020a69cd07 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Mon, 16 Dec 2024 16:30:48 +0800 Subject: [PATCH 108/136] rtorrent: fix updateScript args (#364230) --- pkgs/by-name/rt/rtorrent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 3b58082dd422..5afa2ced4c56 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { tagPrefix = "v"; }; tests = { inherit (nixosTests) rtorrent; }; From e6ee08f9996f3e9e558a2aed8917e4069f0ed6fe Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 12 Dec 2024 22:15:53 -0800 Subject: [PATCH 109/136] libftdi1: apply patch for swig 4.3.0 https://bugzilla.redhat.com/show_bug.cgi?id=2319133 https://src.fedoraproject.org/rpms/libftdi/raw/9051ea9ea767eced58b69d855a5d700a5d4602cc/f/libftdi-1.5-swig-4.3.patch --- pkgs/development/libraries/libftdi/1.x.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 5d579cf8cb33..d09ee1ff9ebe 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchgit +, fetchpatch , cmake , pkg-config , libusb1 @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { hash = "sha256-U37M5P7itTF1262oW+txbKxcw2lhYHAwy1ML51SDVMs="; }; + patches = [ + (fetchpatch { + # http://developer.intra2net.com/mailarchive/html/libftdi/2024/msg00024.html + # https://bugzilla.redhat.com/show_bug.cgi?id=2319133 + name = "swig-4.3.0-fix.patch"; + url = "https://src.fedoraproject.org/rpms/libftdi/raw/9051ea9ea767eced58b69d855a5d700a5d4602cc/f/libftdi-1.5-swig-4.3.patch"; + hash = "sha256-X5tqiPewnyAyvLzR6s0VbNpZKLd0idtPGU4ro36CZHI="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake pkg-config ] From a9a3e341c6bc326e5a3de9324c33ba283f7ce242 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 12 Dec 2024 22:23:45 -0800 Subject: [PATCH 110/136] libftdi1: remove unneeded postFixup substituteInPlace doesn't match anything as files contain correct paths --- pkgs/development/libraries/libftdi/1.x.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index d09ee1ff9ebe..89f3a991e9a3 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -70,14 +70,6 @@ stdenv.mkDerivation rec { cp -r doc/html "$out/share/doc/libftdi1/" ''; - postFixup = optionalString cppSupport '' - # This gets misassigned to the C++ version's path for some reason - for fileToFix in $out/{bin/libftdi1-config,lib/pkgconfig/libftdi1.pc}; do - substituteInPlace $fileToFix \ - --replace "$out/include/libftdipp1" "$out/include/libftdi1" - done - ''; - meta = with lib; { description = "Library to talk to FTDI chips using libusb"; homepage = "https://www.intra2net.com/en/developer/libftdi/"; From 79629762357f93bfaa4a0de1f4990989b34b06f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 08:40:15 +0000 Subject: [PATCH 111/136] python312Packages.google-cloud-datastore: 2.20.1 -> 2.20.2 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index e826e6c77bc3..cd2a14dc30ba 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.20.1"; + version = "2.20.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datastore"; inherit version; - hash = "sha256-B5ULnIhlCHxWX0X6P916BdTD2ZrfeeEMP1lv8Ip9m7o="; + hash = "sha256-lmXQCXKdlVEynZR29NW9qcEdNGkkPqiiwNlJC2WqiZ8="; }; build-system = [ setuptools ]; From 0c198f86eece1657d411c0334b86d2e6b05cd03a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 08:40:52 +0000 Subject: [PATCH 112/136] python312Packages.pontos: 24.12.0 -> 24.12.3 --- pkgs/development/python-modules/pontos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 677b7f7a3c71..e99f07ab0062 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.12.0"; + version = "24.12.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = "pontos"; - rev = "refs/tags/v${version}"; - hash = "sha256-+zlc23NRTDtPRaRnnvlf0tb3kkk+0TYPxACBUR/JWvw="; + tag = "v${version}"; + hash = "sha256-ezU525MPiQkW7nmm/SUdG1dsOfybosdlL1Uf1rHIDFE="; }; build-system = [ poetry-core ]; From ca965ec64f5c4925f9bba3b7e18bc2b41d8dcc56 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Sun, 15 Dec 2024 22:41:05 -0800 Subject: [PATCH 113/136] cryptpad: verify that we've installed the correct versions of OnlyOffice With this change, I saw the following when I built cryptpad: ``` $ nix build .#cryptpad ... > v1 was up to date > v2b was up to date > v4 was up to date > v5 was up to date > v6 was up to date > Wrong commit of /nix/store/1m2d8c4fppfav7n2s4fvali3iira2ky2-cryptpad-2024.9.1/lib/node_modules/cryptpad/www/common/onlyoffice/dist/v7 found. Expected: e1267803. Actual: 9d8b914a ``` This reproduces the issue @martinetd noticed in . I then addressed these issue by fixing the commit we use for `v7` of OnlyOffice. --- pkgs/by-name/cr/cryptpad/package.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cryptpad/package.nix b/pkgs/by-name/cr/cryptpad/package.nix index 4b0cbdd0dcaf..c93539a5bd67 100644 --- a/pkgs/by-name/cr/cryptpad/package.nix +++ b/pkgs/by-name/cr/cryptpad/package.nix @@ -1,6 +1,8 @@ { + bash, buildNpmPackage, fetchFromGitHub, + fetchpatch, fetchurl, lib, makeBinaryWrapper, @@ -56,8 +58,8 @@ let } { subdir = "v7"; - rev = "9d8b914a"; - hash = "sha256-M+rPJ/Xo2olhqB5ViynGRaesMLLfG/1ltUoLnepMPnM="; + rev = "e1267803"; + hash = "sha256-iIds0GnCHAyeIEdSD4aCCgDtnnwARh3NE470CywseS0="; } ]; @@ -90,12 +92,19 @@ buildNpmPackage { makeBinaryWrapper rdfind unzip + bash ]; patches = [ # fix httpSafePort setting # https://github.com/cryptpad/cryptpad/pull/1571 ./0001-env.js-fix-httpSafePort-handling.patch + # https://github.com/cryptpad/cryptpad/pull/1740 + (fetchpatch { + name = "Add `--check`, `--rdfind`, `--no-rdfind` options to `install-onlyoffice.sh`"; + url = "https://github.com/cryptpad/cryptpad/commit/f38668735e777895db2eadd3413cff386fb12c0c.patch"; + hash = "sha256-J4AK1XIa3q+/lD74p2c9O7jt0VEtofTmfAaQNU71sp8="; + }) ]; # cryptpad build tries to write in cache dir @@ -121,7 +130,11 @@ buildNpmPackage { mkdir -p "$out_cryptpad/www/common/onlyoffice/dist" ${lib.concatMapStringsSep "\n" onlyoffice_install onlyoffice_versions} ${x2t_install} - rdfind -makehardlinks true -makeresultsfile false "$out_cryptpad/www/common/onlyoffice/dist" + # Run upstream's `install-onlyoffice.sh` script in `--check` mode to + # verify that we've installed the correct versions of the various + # OnlyOffice components. + patchShebangs --build $out_cryptpad/install-onlyoffice.sh + $out_cryptpad/install-onlyoffice.sh --accept-license --check --rdfind # cryptpad assumes it runs in the source directory and also outputs # its state files there, which is not exactly great for us. From bdd90d3316686283a4c9f620cb7ab34dd695ad3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 09:01:19 +0000 Subject: [PATCH 114/136] python312Packages.galois: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/galois/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 50999a139bf0..4eba6cd7c5c0 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mhostetter"; repo = "galois"; - rev = "refs/tags/v${version}"; - hash = "sha256-DbmrrNw7XwTL4i6pJIfkBOUs+KGEmdV2FmQa1xfOHYU="; + tag = "v${version}"; + hash = "sha256-1gKL97oS06vgq4gpQSXeMfKzAtjAGQnB48W5BOiMBHA="; }; pythonRelaxDeps = [ From b7c656421e3627115e6535eef79aeff2aa4cd9e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 09:33:48 +0000 Subject: [PATCH 115/136] python312Packages.pytest-ansible: 24.9.0 -> 24.12.0 --- pkgs/development/python-modules/pytest-ansible/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index bc8106a999a6..0ddb147a32a0 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "24.9.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; - rev = "refs/tags/v${version}"; - hash = "sha256-OlRWtKMgcZCDCFcUl3YXzG/ERPfx2KBEaKNf0strgCU="; + tag = "v${version}"; + hash = "sha256-Z0pgWptr/bDGZCMi0l8J+q39d3zwBHfawNeJtELHo0E="; }; postPatch = '' From d290f478a9965953b697301051163e6150288db1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 09:43:16 +0000 Subject: [PATCH 116/136] tageditor: 3.9.3 -> 3.9.4 --- pkgs/applications/audio/tageditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 8464918d746a..4c21e137aed1 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.3"; + version = "3.9.4"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-KAtOnTf3foOILDfTjVpkCOG6jsyS5fv0/Wv9Zcut2oE="; + hash = "sha256-VRQV4bTPG4VFhRHFJamUnYd04ZCaNpaxU27Jcl6Chc4="; }; nativeBuildInputs = [ From 28a18f2e787ac14137b63b17534a7949fe5975b0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 16 Dec 2024 10:48:55 +0100 Subject: [PATCH 117/136] python312Packages.treescope: 0.1.6 -> 0.1.7 Diff: https://github.com/google-deepmind/treescope/compare/refs/tags/v0.1.6...v0.1.7 Changelog: https://github.com/google-deepmind/treescope/releases/tag/v0.1.7 --- pkgs/development/python-modules/treescope/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/treescope/default.nix b/pkgs/development/python-modules/treescope/default.nix index 48af7dc2c553..d5e95260d9a8 100644 --- a/pkgs/development/python-modules/treescope/default.nix +++ b/pkgs/development/python-modules/treescope/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "treescope"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "treescope"; - rev = "refs/tags/v${version}"; - hash = "sha256-QlCKdsQk9VzRNnQKqWUIt6drocx++Aq34cMmZTw0UZw="; + tag = "v${version}"; + hash = "sha256-fDwiKKXgisJ4Z/CBv4Vwtd7QaGscu5teZo11mSGZjbE="; }; build-system = [ flit-core ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = { description = "An interactive HTML pretty-printer for machine learning research in IPython notebooks"; homepage = "https://github.com/google-deepmind/treescope"; - changelog = "https://github.com/google-deepmind/treescope/releases/tag/v${version}"; + changelog = "https://github.com/google-deepmind/treescope/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; From 8885b3ba1756a656171460513cdb5569ad8c5e20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 10:32:22 +0000 Subject: [PATCH 118/136] python312Packages.pyquil: 4.14.3 -> 4.15.0 --- pkgs/development/python-modules/pyquil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index efc9368907df..0e2d63d80c50 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.14.3"; + version = "4.15.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,8 +33,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = "pyquil"; - rev = "refs/tags/v${version}"; - hash = "sha256-kGrOvec2q1GoVweu5tTbz8kvnjG6RAfjlF64Uf3RTxw="; + tag = "v${version}"; + hash = "sha256-zRXIMSgcFlTZQ5Y/1pSC30ZhvKj1Pn1+7SbTetEdzio="; }; pythonRelaxDeps = [ From 35f52c9d8a7db48a0817b2fd5747aa10ca2aad55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 11:28:12 +0000 Subject: [PATCH 119/136] python312Packages.rocketchat-api: 1.33.0 -> 1.34.0 --- pkgs/development/python-modules/rocketchat-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index b5b527b2b402..d10f94d72f31 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "1.33.0"; + version = "1.34.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; - rev = "refs/tags/${version}"; - hash = "sha256-t1t0uksmdPTrksDF0K3/f3KxAv0fX2W8wDIIcWAPEVs="; + tag = version; + hash = "sha256-ny/VybQDZFB4ZxHEnDP2IeYsHjgO9pAk4r0vpX+hWVE="; }; build-system = [ setuptools ]; From af44a5aff062c8fdb4de97f58a45e1c5545110f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 11:32:38 +0000 Subject: [PATCH 120/136] python312Packages.cytoolz: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/cytoolz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 574e717759e7..03b0b8c106b5 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-60U7MBghUvmRelGJt9mQRrbOkM34rrD+/0smg+YA3v0="; + hash = "sha256-icwxYbieG7Ptdjb3TtLlWYT9NVFpBPyHjK4hbkKyx9Y="; }; nativeBuildInputs = [ From 53c361bd7a3f575eac7ade5d3a828e14c7f40382 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Mon, 16 Dec 2024 14:27:23 +0200 Subject: [PATCH 121/136] vulnix: Make henrirosten a maintainer Signed-off-by: Henri Rosten --- pkgs/by-name/vu/vulnix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vu/vulnix/package.nix b/pkgs/by-name/vu/vulnix/package.nix index 23e9c13ed400..89b361bbff78 100644 --- a/pkgs/by-name/vu/vulnix/package.nix +++ b/pkgs/by-name/vu/vulnix/package.nix @@ -67,6 +67,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "vulnix"; homepage = "https://github.com/nix-community/vulnix"; license = licenses.bsd3; - maintainers = with maintainers; [ ckauhaus ]; + maintainers = with maintainers; [ henrirosten ]; }; } From 11f0fc5467b0e7b840b698d6ccdf819feba6aa05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 12:31:58 +0000 Subject: [PATCH 122/136] arcticons-sans: 0.590 -> 0.591 --- pkgs/by-name/ar/arcticons-sans/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arcticons-sans/package.nix b/pkgs/by-name/ar/arcticons-sans/package.nix index cb16a684ba29..5905d8bfa784 100644 --- a/pkgs/by-name/ar/arcticons-sans/package.nix +++ b/pkgs/by-name/ar/arcticons-sans/package.nix @@ -6,10 +6,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arcticons-sans"; - version = "0.590"; + version = "0.591"; src = fetchzip { - hash = "sha256-0iSkTfUMgrKi6LF+9KAihPus0biGuOFsYN51ydYAF5E="; + hash = "sha256-fMsAvrH4NVdXoywW66fJhNWDDY5JxDxPJgvaUD9lEpw="; url = "https://github.com/arcticons-team/arcticons-font/archive/refs/tags/${finalAttrs.version}.zip"; }; From 1bfd4c6a3da70c2929243ebcd533d57e3d717f7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:06:31 +0000 Subject: [PATCH 123/136] frp: 0.61.0 -> 0.61.1 --- pkgs/by-name/fr/frp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 419cf6e76f81..13e589f308d6 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "frp"; - version = "0.61.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-ZanHYU7UEPsI/KAygxcTszUB4emnrrqxiuuLsCVk+cM="; + hash = "sha256-HPhT+crjQELQMDpBywWy+POplKxfLrHCAWkTRRhogqA="; }; - vendorHash = "sha256-ySONxi45Ckq0y4BNyTcm8s6KcnXW+k6thqL7qh6mbBc="; + vendorHash = "sha256-Pwa5idGOn1kTxhouxYwNlKafYU541/rQolm+2CJnLo4="; doCheck = false; From b43dc8c2650eb36fbb38cb43826357ac588231c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:16:32 +0000 Subject: [PATCH 124/136] infrastructure-agent: 1.58.0 -> 1.58.1 --- pkgs/by-name/in/infrastructure-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index d62e91af21c4..9c6100262d2e 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.58.0"; + version = "1.58.1"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-L2er3DJ9zZb8AosHwOdNEsvQc7XPwQfGaa8d72iJOik="; + hash = "sha256-ckGouBmpjsS3qcTw3Br3N/uJf7KgowUyawr2bPsMJ5I="; }; vendorHash = "sha256-0WLL15CXRi/flp4EV3Qt0wO1VaUmAokzsChpiqjs+YQ="; From c65684b73a6c8d8945dc4d87d4bceca5d91b3d9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:26:05 +0000 Subject: [PATCH 125/136] litmusctl: 1.12.0 -> 1.13.0 --- pkgs/by-name/li/litmusctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 63c4151c12df..7991cc130c41 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "litmusctl"; - version = "1.12.0"; + version = "1.13.0"; nativeBuildInputs = [ installShellFiles @@ -22,7 +22,7 @@ buildGoModule rec { owner = "litmuschaos"; repo = "litmusctl"; rev = "${version}"; - hash = "sha256-pqkUaR/r9GKvTt8hEjqgSuEcNuSeRE+rtlj47uS5/dY="; + hash = "sha256-lPdejdnBefhYgv52I7BOm1VTgqHSp8u1lgJJxK5GWSA="; }; vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0="; From 12a27848a1cea2ea636e9e026c6828907ddc3390 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:35:32 +0000 Subject: [PATCH 126/136] nova-password: 0.5.7 -> 0.5.8 --- pkgs/by-name/no/nova-password/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/nova-password/package.nix b/pkgs/by-name/no/nova-password/package.nix index 89c94b2389fa..ff9a35e29394 100644 --- a/pkgs/by-name/no/nova-password/package.nix +++ b/pkgs/by-name/no/nova-password/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nova-password"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { owner = "sapcc"; repo = "nova-password"; rev = "refs/tags/v${version}"; - hash = "sha256-tjjP+LmYaqpzmTk3tgFqZlG1KEeAkfI7RxzSm97jWVU="; + hash = "sha256-+qFbBjjbp1Nazpo21oOytvEPzn6Nmc4Cr8du045Ab/E="; }; - vendorHash = "sha256-MwemuOaXGl0eF+lVtMCgbBeJGILmaeEHcbu+xp8Lm70="; + vendorHash = "sha256-tRBWniPM/IPR/JKi7R46tnx9rgyCb5hOkOR1oy7iVcc="; meta = { description = "Decrypt the admin password generated for the VM in OpenStack"; From df6fb983d2ffb1bab854bd245e7f47175767d8c7 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Thu, 5 Dec 2024 04:37:45 +0900 Subject: [PATCH 127/136] dune_3: 3.16.1 -> 3.17.0 Co-authored-by: Vincent Laporte --- pkgs/development/ocaml-modules/hxd/default.nix | 4 ++++ .../development/ocaml-modules/ocplib-simplex/default.nix | 9 ++++++++- pkgs/development/ocaml-modules/reason-react/default.nix | 5 +++++ pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index d3a8ce7a85bd..de60667327b4 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -23,6 +23,10 @@ buildDunePackage rec { doCheck = true; + preCheck = '' + export DUNE_CACHE=disabled + ''; + meta = with lib; { description = "Hexdump in OCaml"; homepage = "https://github.com/dinosaure/hxd"; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 74ca96b18661..7d1c2d49d778 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, logs, zarith }: +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, logs, zarith }: buildDunePackage rec { pname = "ocplib-simplex"; @@ -11,6 +11,13 @@ buildDunePackage rec { hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko="; }; + # Fix tests with dune 3.17.0 + # See https://github.com/OCamlPro/ocplib-simplex/issues/35 + patches = (fetchpatch { + url = "https://github.com/OCamlPro/ocplib-simplex/commit/456a744bddd397daade7959d4a49cfadafdadd33.patch"; + hash = "sha256-tQUXOoRGe1AIzHcm6j2MopROxn75OE9YUP+CwcKUbVg="; + }); + propagatedBuildInputs = [ logs zarith ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/reason-react/default.nix b/pkgs/development/ocaml-modules/reason-react/default.nix index 340b0c1c27b1..a447c3172d60 100644 --- a/pkgs/development/ocaml-modules/reason-react/default.nix +++ b/pkgs/development/ocaml-modules/reason-react/default.nix @@ -17,6 +17,11 @@ buildDunePackage { melange ]; doCheck = true; + # Fix tests with dune 3.17.0 + # See https://github.com/reasonml/reason-react/issues/870 + preCheck = '' + export DUNE_CACHE=disabled + ''; meta = reason-react-ppx.meta // { description = "Reason bindings for React.js"; }; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 289f81af5702..0cadd4fb20e0 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.16.1"; + version = "3.17.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-t4GuIPh2E8KhG9BxeAngBHDILWFeFSZPmmTgMwUaw94="; + hash = "sha256-LDqmxB7Tnj1sGiktdfSAa9gDEIQa/FFnOqWc6cgWUHw="; }; nativeBuildInputs = [ ocaml findlib ]; From e29672356238ec2fadf9cc1473eeeffed4272862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:39:02 +0000 Subject: [PATCH 128/136] nom: 2.6.1 -> 2.6.2 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 84a98183a047..97c43e597fda 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-V4ppqHQjPkkRKHkDHzEr05vOyv3BhiLnYxEftIn08XU="; + hash = "sha256-oaManxhksEBwbe1jmkRmOJMhYFiulGTVCuto4RMznvg="; }; vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M="; From 16b20bf3de0d022fcbaa4d14fd482b23f79af6f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 13:56:07 +0000 Subject: [PATCH 129/136] python312Packages.imgw-pib: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/imgw-pib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/imgw-pib/default.nix b/pkgs/development/python-modules/imgw-pib/default.nix index 996f1afc87e3..a43678b4ff8d 100644 --- a/pkgs/development/python-modules/imgw-pib/default.nix +++ b/pkgs/development/python-modules/imgw-pib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "imgw-pib"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchFromGitHub { owner = "bieniu"; repo = "imgw-pib"; - rev = "refs/tags/${version}"; - hash = "sha256-0ttGUsu00y/uuTXzPYkgh1QLMYOwPI/m8Qwk5Ty0Y3A="; + tag = version; + hash = "sha256-vhLBnUjCq9OUQViVWJT6jgcEeRYsjz307x1o28ZUv0g="; }; build-system = [ setuptools ]; From d5470c17e432c2ca1b88fb3b94c6eddbb9b02bac Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 16 Dec 2024 15:21:46 +0100 Subject: [PATCH 130/136] python312Packages.plotnine: 0.14.3 -> 0.14.4 Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.14.3...v0.14.4 Changelog: https://github.com/has2k1/plotnine/releases/tag/v0.14.4 --- pkgs/development/python-modules/plotnine/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index f6f2a003b0cd..6fd63a35390c 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.14.3"; + version = "0.14.4"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; - rev = "refs/tags/v${version}"; - hash = "sha256-hGgPW40PEkOV1Z7gaqHtbx1ybdtEFYyz8fYUBMZchmU="; + tag = "v${version}"; + hash = "sha256-pNbnbzmY3WMCfmuvaVa0JRuyadlvnVCIx5jtni/VcVI="; }; postPatch = '' @@ -111,7 +111,7 @@ buildPythonPackage rec { meta = { description = "Grammar of graphics for Python"; homepage = "https://plotnine.readthedocs.io/"; - changelog = "https://github.com/has2k1/plotnine/releases/tag/v${version}"; + changelog = "https://github.com/has2k1/plotnine/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; }; From defc8e70fe32f004848029945ead7d8cf977a71e Mon Sep 17 00:00:00 2001 From: 9R Date: Mon, 16 Dec 2024 14:23:12 +0100 Subject: [PATCH 131/136] home-assistant-custom-components.moonraker: 1.5.0 -> 1.5.1 --- .../home-assistant/custom-components/moonraker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 84cdd06a9607..6da582239dad 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; rev = "refs/tags/${version}"; - hash = "sha256-LGpCT0a6mxbf0W6ucTIBhl9aNUd5/1dUk6M+CzRKuoU="; + hash = "sha256-vBsNpCCYLxL5T9LPRitR3a6mBRQwxoDtUDXzN0hCSTQ="; }; dependencies = [ From 7c06ddfe668f5d75825552f2cfe811f9c1f16b72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 14:31:14 +0000 Subject: [PATCH 132/136] python312Packages.craft-cli: 2.10.1 -> 2.12.0 --- pkgs/development/python-modules/craft-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index 5438683cd995..ff5b86d6adec 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "craft-cli"; - version = "2.10.1"; + version = "2.12.0"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-cli"; rev = "refs/tags/${version}"; - hash = "sha256-XKRV5VJLC3B5gcNr/icOxWB6pDXDT7MV5wM/vEQHVm4="; + hash = "sha256-edN0eEXBaYDUqSc7Xv22MpG9wkHqI6x1HtRkQ468yH8="; }; postPatch = '' From f9883d977a91079db35f10c82681535e11bbbf20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 22:18:16 +0000 Subject: [PATCH 133/136] python312Packages.pdoc: 15.0.0 -> 15.0.1 --- pkgs/development/python-modules/pdoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index a372d124ac3a..986965a927d8 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "15.0.0"; + version = "15.0.1"; disabled = pythonOlder "3.9"; pyproject = true; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-6XEcHhaKkxY/FU748f+OsTcSgrM4iQTmJAL8rJ3EqnY="; + hash = "sha256-HDrDGnK557EWbBQtsvDzTst3oV0NjLRm4ilXaxd6/j8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; dependencies = [ jinja2 From c5217143e8169449328d343497ed2f108bd46794 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 16 Dec 2024 15:50:55 +0100 Subject: [PATCH 134/136] pylyzer: 0.0.73 -> 0.0.74 Diff: https://github.com/mtshiba/pylyzer/compare/None...v0.0.74 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.74 --- pkgs/by-name/py/pylyzer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 25f512e6d72b..43420e572d59 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.73"; + version = "0.0.74"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-rpF0xrk1PvgfJ0EOHWnCuSWfzLVzXErnKizbvFBP+pg="; + hash = "sha256-NVCFwISPRTNgs4hn9ezp2Xb4r7xytziIByVSKyqt/lo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-pU230ghfHsJEcADoZH8/yP+fYDv21FPlwA0//SvHJWY="; + cargoHash = "sha256-mNFRP6mT4mKKKg05nJcdd8qy6YFxWVADHIU9uGrEcng="; nativeBuildInputs = [ git @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Fast static code analyzer & language server for Python"; homepage = "https://github.com/mtshiba/pylyzer"; - changelog = "https://github.com/mtshiba/pylyzer/releases/tag/v${version}"; + changelog = "https://github.com/mtshiba/pylyzer/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "pylyzer"; From 8d7fd764791514a955a618f222180316ed05c465 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 16 Dec 2024 16:47:17 +0100 Subject: [PATCH 135/136] typstyle: 0.12.10 -> 0.12.12 Diff: https://github.com/Enter-tainer/typstyle/compare/None...v0.12.12 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.12.12/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index f2a3216ec8a1..c7f9368ff297 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.12.10"; + version = "0.12.12"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; tag = "v${version}"; - hash = "sha256-nrsfp0T4QYLZw5F5R4iTewUjlZOErc/15c0O6O9BFBE="; + hash = "sha256-oQnZm+BkccHN3xXSe1yBus3m4JKyCBKM9kkJz+QryR0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gPsZRdksX+7sZWK7V/q17oZmN2kgQkApC66/3KowDCI="; + cargoHash = "sha256-pbsB9mQafgI6PudjeCzOSpk3+iZkkdp/V1zgH8pP7us="; # Disabling tests requiring network access checkFlags = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.tag}/CHANGELOG.md"; description = "Format your typst source code"; homepage = "https://github.com/Enter-tainer/typstyle"; license = lib.licenses.asl20; From 59c5ef5569be51fe5c95557fc18027f51ba37b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Dec 2024 19:00:40 +0100 Subject: [PATCH 136/136] Revert "prefetch-npm-deps: check response status and fail on error (#297863)" This reverts commit 74e24a96dcd291d3ceedcf7bf67ef0e477a4376d. --- .../node/fetch-npm-deps/src/util.rs | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs index 36e2333a3e1a..023ba56793b9 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs @@ -1,4 +1,3 @@ -use anyhow::bail; use backoff::{retry, ExponentialBackoff}; use data_encoding::BASE64; use digest::Digest; @@ -6,7 +5,6 @@ use isahc::{ config::{CaCertificate, Configurable, RedirectPolicy, SslOption}, Body, Request, RequestExt, }; -use log::info; use nix_nar::{Encoder, NarError}; use serde_json::{Map, Value}; use sha2::Sha256; @@ -17,7 +15,7 @@ use std::{ }; use url::Url; -pub fn get_url(url: &Url) -> Result { +pub fn get_url(url: &Url) -> Result { let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10)); // Respect SSL_CERT_FILE if environment variable exists @@ -39,27 +37,16 @@ pub fn get_url(url: &Url) -> Result { if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") { if let Ok(tokens) = serde_json::from_str::>(&npm_tokens) { if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) { - info!("Found NPM token for {}. Adding authorization header to request.", host); request = request.header("Authorization", format!("Bearer {token}")); } } } } - let res = request.body(())?.send()?; - if !res.status().is_success() { - if res.status().is_client_error() { - bail!("Client error: {}", res.status()); - } - if res.status().is_server_error() { - bail!("Server error: {}", res.status()); - } - bail!("{}", res.status()); - } - Ok(res.into_body()) + Ok(request.body(())?.send()?.into_body()) } -pub fn get_url_body_with_retry(url: &Url) -> Result, anyhow::Error> { +pub fn get_url_body_with_retry(url: &Url) -> Result, isahc::Error> { retry(ExponentialBackoff::default(), || { get_url(url) .and_then(|mut body| { @@ -69,15 +56,12 @@ pub fn get_url_body_with_retry(url: &Url) -> Result, anyhow::Error> { Ok(buf) }) - .map_err(|err| match err.downcast_ref::() { - Some(isahc_err) => { - if isahc_err.is_network() || isahc_err.is_timeout() { - backoff::Error::transient(err) - } else { - backoff::Error::permanent(err) - } + .map_err(|err| { + if err.is_network() || err.is_timeout() { + backoff::Error::transient(err) + } else { + backoff::Error::permanent(err) } - None => backoff::Error::permanent(err), }) }) .map_err(|backoff_err| match backoff_err {