From fe56c85a5e7a5b7ac9b6dfbf92a6d706c7c42efa Mon Sep 17 00:00:00 2001 From: Drew Risinger <10198051+drewrisinger@users.noreply.github.com> Date: Thu, 9 Mar 2023 15:35:03 -0800 Subject: [PATCH 01/36] mkl: add CMake config files --- pkgs/development/libraries/science/math/mkl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 9becf229c9ef..d6bc1050c5c5 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -139,6 +139,9 @@ in stdenvNoCC.mkDerivation ({ # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ + + # CMake config + cp -r opt/intel/oneapi/mkl/${mklVersion}/lib/cmake $out/lib '' + (if enableStatic then '' install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a From a4122c898c287d6a32a67b0206a0f1f969121974 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 16 Mar 2023 21:40:09 +0200 Subject: [PATCH 02/36] cutemaze: unbreak on darwin --- pkgs/games/cutemaze/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index a141591211c0..a0f2d725d4bf 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -26,14 +26,20 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase - qtwayland qtsvg + ] ++ lib.optionals stdenv.isLinux [ + qtwayland ]; - postInstall = lib.optionalString stdenv.isDarwin '' + installPhase = if stdenv.isDarwin then '' + runHook preInstall + mkdir -p $out/Applications mv CuteMaze.app $out/Applications - ''; + makeWrapper $out/Applications/CuteMaze.app/Contents/MacOS/CuteMaze $out/bin/cutemaze + + runHook postInstall + '' else null; meta = with lib; { changelog = "https://github.com/gottcode/cutemaze/blob/v${version}/ChangeLog"; From 7a2128a83638c7bbe20b845f108f03874969d0c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Mar 2023 14:20:53 +0000 Subject: [PATCH 03/36] woodpecker-server: 0.15.6 -> 0.15.7 --- .../tools/continuous-integration/woodpecker/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index e94e83b7e6b9..cae74c86b320 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "0.15.6"; - srcSha256 = "sha256-8XXeGEw7+NGULsD5/g1j9+P2h82oRpEuMJT6sMp+z38="; + version = "0.15.7"; + srcSha256 = "sha256-Y6ew9CychStC26A7uyjChvkR+oDis3GZq8kYLHS7AXQ="; yarnSha256 = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; in { From f703a121c0fc3be1b2fcbbefa670c14b988fd424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 01:48:14 +0000 Subject: [PATCH 04/36] step-kms-plugin: 0.7.0 -> 0.8.0 --- pkgs/tools/security/step-kms-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index eacfea39bd76..316729e4fe6a 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-5oMkR997ZbPpOqazpyxEvLKbak7THAu855FC6a/Tr+4="; + hash = "sha256-VHQuNJzOYr5aLQqlzx6mDPBOKw6OSPSXBiEopKLuUo0="; }; - vendorHash = "sha256-Zd2rZez5vP9uL5dolGHO8FR0ARoYP78amcakK/lKtdc="; + vendorHash = "sha256-o6mylylpfQyswXA0kCADjqYFE0XDW9ZYglwDMpFRiu8="; proxyVendor = true; From e8ce7ef64583e6ae8149b0caf92c58cea37706ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 02:38:35 +0000 Subject: [PATCH 05/36] fio: 3.33 -> 3.34 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6dabb9178332..49707d1530b2 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.33"; + version = "3.34"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-d4Fx2QdO+frt+gcBzegJ9CW5NJQRLNkML/iD3te/1d0="; + sha256 = "sha256-+csIerzwYOmXfmykYI0DHzbJf4iUCkEy1f7SFmAiuv4="; }; buildInputs = [ python3 zlib ] From 114cb72cda6e46931837a3c801f5fc49d9c39ccb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Mar 2023 04:20:00 +0000 Subject: [PATCH 06/36] luau: 0.567 -> 0.568 https://github.com/Roblox/luau/releases/tag/0.568 --- pkgs/development/interpreters/luau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index ad45dd299fbe..1a084d8b94ba 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.567"; + version = "0.568"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-x1P9/TZUU/XITH1/8NtPXzM46fwk0VxHNphlWqzhoog="; + hash = "sha256-ToNAduAKc4gJqO+fMZ2ZT43lnobonytdaSN5Yh0Q6A8="; }; nativeBuildInputs = [ cmake ]; From 8403c0d5e2c41d8b25eac7bec689159c09255302 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 17 Mar 2023 22:14:43 -0700 Subject: [PATCH 07/36] python3Packages.debugpy: fix test failures --- pkgs/development/python-modules/debugpy/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index d6dfff0ad795..95f2d8b21eef 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , substituteAll , gdb , django @@ -37,6 +38,12 @@ buildPythonPackage rec { inherit version; }) + # https://github.com/microsoft/debugpy/issues/1230 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/microsoft/debugpy/pull/1232.patch"; + sha256 = "sha256-m5p+xYiJ4w4GcaFIaPmlnErp/7WLwcvJmaCqa2SeSxU="; + }) + # Fix importing debugpy in: # - test_nodebug[module-launch(externalTerminal)] # - test_nodebug[module-launch(integratedTerminal)] @@ -100,10 +107,14 @@ buildPythonPackage rec { pytestFlagsArray = [ "--timeout=0" ]; - # Fixes hanging tests on Darwin __darwinAllowLocalNetworking = true; + disabledTests = [ + # https://github.com/microsoft/debugpy/issues/1241 + "test_flask_breakpoint_multiproc" + ]; + pythonImportsCheck = [ "debugpy" ]; From 080676458c1ec1c73751d60469a16756e9c763f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 07:02:45 +0000 Subject: [PATCH 08/36] oxker: 0.2.4 -> 0.2.5 --- pkgs/applications/misc/oxker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 50fc4ec9fec5..3225b5807df3 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.2.4"; + version = "0.2.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-wYGaBXorAcwFnlUixrOP63s32WV1V7/8SUOBXIeLB7o="; + sha256 = "sha256-w0YLSwRv6uhDwi06q0/mhGc5C6O2xq3vc9Se7/xXkhA="; }; - cargoHash = "sha256-rdzr6oOrJNTX3dCSO3ZdKNFZ31/CHdupKL7QmmuuX7I="; + cargoHash = "sha256-Q0+6YgcdWa4RjNA7ffQJN0uIN8UFuCdbYjTFoM8w8uo="; meta = with lib; { description = "A simple tui to view & control docker containers"; From 8b7c79c8ba4b5e77a8ffadb4e065e26870eb8b23 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 18 Mar 2023 10:11:29 +0100 Subject: [PATCH 09/36] python3Packages.pywlroots: revert to pywlroots 0.15.24 This reverts commit b60a1fef4af412cb7c456a3199bcdc25f6783c3b and commit 6378b8bc0f55e50ad0278928fe07e8bfa944fd4b. pywlroots 0.16 isn't compatible with qtile, its only reverse dependency. --- pkgs/development/python-modules/pywlroots/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 8d547239f089..53f583cc7c28 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -9,7 +9,7 @@ , pixman , pythonOlder , udev -, wlroots_0_16 +, wlroots , wayland , pywayland , xkbcommon @@ -19,19 +19,19 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.16.1"; + version = "0.15.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GFJw88N0313PudM0o/jOvtoE3u8kSoV+lYgKlNya4wM="; + hash = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE="; }; nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots_0_16 ]; + buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; nativeCheckInputs = [ pytestCheckHook ]; From 61c26c593f299eb26ae297f43e908f8d2097d675 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 11:50:43 +0200 Subject: [PATCH 10/36] srvc: 0.14.1 -> 0.15.0 --- pkgs/applications/version-management/srvc/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 258f03eb7831..1d2e5b46e46b 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,20 +1,21 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-6wA2dnUUgS6HNQo2vMFqoT+seZHqcNLoTN+f5+Ok1AQ="; + hash = "sha256-vShPc+Tz8n2o8E13npr7ZbDzRaAesWBOJQaCO5ljypM="; }; - cargoHash = "sha256-XkRnbfTaCo0J1+yOOvIxhDTjtaZURkjFOPWsFRk8iNU="; + cargoHash = "sha256-fHHJR1OvqCYfJkXe9mVQXJeTETDadR65kf8LMsPdAds="; buildInputs = lib.optionals stdenv.isDarwin [ - Security + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1708180d2d8b..7d5cf7cfd4b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5600,9 +5600,7 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + srvc = callPackage ../applications/version-management/srvc { }; ssmsh = callPackage ../tools/admin/ssmsh { }; From ccaa6078baed0531eeeb6e788febe81aba461d65 Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 18 Mar 2023 11:34:51 +0100 Subject: [PATCH 11/36] nixos/gitlab: Fix error when GitLab Pages is not enabled Even if GitLab is used without Pages, some of its settings are still used in the gitlab.yml file, resulting in errors such as error: The option `services.gitlab.pages.settings.pages-domain' is used but not defined. To fix this, make the settings' usage conditional on Pages being enabled. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index c7299c1ccad8..d278b571a641 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -156,7 +156,7 @@ let }; extra = {}; uploads.storage_path = cfg.statePath; - pages = { + pages = optionalAttrs cfg.pages.enable { enabled = cfg.pages.enable; port = 8090; host = cfg.pages.settings.pages-domain; From eacf840bcaa35ee0ba0ae05ae094fc7f2469c8a2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Mar 2023 08:03:30 +0100 Subject: [PATCH 12/36] =?UTF-8?q?ocamlPackages.pgocaml:=204.2.2-dev-202101?= =?UTF-8?q?11=20=E2=86=92=204.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/pgocaml/default.nix | 10 +++++----- pkgs/development/ocaml-modules/pgocaml/ppx.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 5c00f2c8991f..22ef94af92e1 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -4,16 +4,16 @@ buildDunePackage rec { pname = "pgocaml"; - version = "4.2.2-dev-20210111"; + version = "4.3.0"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e"; - sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2"; + rev = version; + hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY="; }; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix index dce2e2b0c99d..b649f70d198c 100644 --- a/pkgs/development/ocaml-modules/pgocaml/ppx.nix +++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix @@ -2,7 +2,10 @@ buildDunePackage { pname = "pgocaml_ppx"; - inherit (pgocaml) src version useDune2 meta; + inherit (pgocaml) src version meta; - propagatedBuildInputs = [ pgocaml ppx_optcomp ]; + duneVersion = "3"; + + buildInputs = [ ppx_optcomp ]; + propagatedBuildInputs = [ pgocaml ]; } From f3b75ef3ce58f8b91a53848f590a37f89bb54148 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 19 Mar 2023 00:42:29 +0900 Subject: [PATCH 13/36] mafft: 7.508 -> 7.515 --- pkgs/applications/science/biology/mafft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index 19d0d93c58df..6b317b43de6e 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mafft"; - version = "7.508"; + version = "7.515"; src = fetchFromGitLab { owner = "sysimm"; repo = pname; - rev = version; - sha256 = "sha256-XQllmTgLntCBUFJzV2HL4f4oMilcUVTRgcfeZBdD5c0="; + rev = "v${version}"; + sha256 = "sha256-ssZvjOHJLsBjB48sKr1U7VrRZUIduFkme22MdVbzoNk="; }; preBuild = '' From b3a8004bd2b8f8bb0fb5a2cc2b33925a74809204 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 17:59:06 +0200 Subject: [PATCH 14/36] rapidsvn: 0.12.1 -> unstable-2021-08-02 --- .../version-management/rapidsvn/default.nix | 64 ++++++++++--------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 5c1499139ca0..7c2972538e9e 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,44 +1,51 @@ -{ lib, stdenv, fetchurl, wxGTK30, subversion, apr, aprutil, python3, fetchpatch }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, subversion +, apr +, aprutil +, python3 +, darwin +}: stdenv.mkDerivation rec { pname = "rapidsvn"; - version = "0.12.1"; + version = "unstable-2021-08-02"; - src = fetchurl { - url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz"; - sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; + src = fetchFromGitHub { + owner = "RapidSVN"; + repo = "RapidSVN"; + rev = "3a564e071c3c792f5d733a9433b9765031f8eed0"; + hash = "sha256-6bQTHAOZAP+06kZDHjDx9VnGm4vrZUDyLHZdTpiyP08="; }; - buildInputs = [ wxGTK30 subversion apr aprutil python3 ]; + postPatch = '' + substituteInPlace configure.ac \ + --replace "[3.0.*]" "[3.*]" + ''; - env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + wxGTK32 + subversion + apr + aprutil + python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; - patches = [ - ./fix-build.patch - # Python 3 compatibility patches - (fetchpatch { - url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch"; - hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI="; - }) - (fetchpatch { - url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch"; - hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM="; - }) - (fetchpatch { - url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch"; - hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g="; - }) - # wxWidgets 3.0 compatibility patches - (fetchpatch { - url = "https://sources.debian.org/data/main/r/rapidsvn/0.12.1dfsg-3.1/debian/patches/wx3.0.patch"; - sha256 = "sha256-/07+FoOrNw/Pc+wlVt4sGOITfIIEu8ZbI3/ym0u8bs4="; - }) - ]; + env.NIX_CFLAGS_COMPILE = "-std=c++14"; meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; @@ -46,6 +53,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; }; } From 5ab6260d62ebcbf72e96484584a26e8226167fc8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:04:59 +0200 Subject: [PATCH 15/36] metamorphose2: migrate to wxPython_4_2 --- pkgs/applications/misc/metamorphose2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 9bf2bbab70d1..69662f4f4958 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_1 pillow six ]; + propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_2 pillow six ]; makeFlags = [ "PREFIX=$(out)" ]; From 53f8c023759aba23c75999132aa6e3530c116e3b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:18:09 +0200 Subject: [PATCH 16/36] playonlinux: migrate to wxPython_4_2 --- pkgs/applications/misc/playonlinux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 669f25e1509e..edeb7ceae962 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -61,7 +61,7 @@ let libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ]; python = python3.withPackages(ps: with ps; [ - wxPython_4_1 + wxPython_4_2 setuptools natsort ]); From 7f5a37392dc4d7645f412e8ce256b7aadf4a173e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:39:59 +0200 Subject: [PATCH 17/36] cl, wings: unbreak on aarch64-linux --- pkgs/applications/graphics/wings/default.nix | 15 +++++++++++---- pkgs/development/libraries/cl/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 8 ++------ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 53f658590739..094a483ae7b8 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: +{ lib, stdenv, fetchurl, fetchpatch, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { pname = "wings"; @@ -9,10 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; }; - ERL_LIBS = "${cl}/lib/erlang/lib"; + patches = [ + (fetchpatch { + url = "https://github.com/dgud/wings/commit/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch"; + hash = "sha256-DHT1TiYoowloIWrdutBu70mL+557cTFr1dRcNgwbkpE="; + }) + ]; - patchPhase = '' - sed -i 's,-Werror ,,' e3d/Makefile + postPatch = '' + find . -type f -name "Makefile" -exec sed -i 's,-Werror ,,' {} \; sed -i 's,../../wings/,../,' icons/Makefile find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/src/,../../src/,' {} \; find plugins_src -mindepth 2 -type f -name "*.[eh]rl" -exec sed -i 's,wings/e3d/,../../e3d/,' {} \; @@ -24,6 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ erlang cl libGL libGLU ]; + ERL_LIBS = "${cl}/lib/erlang/lib"; + # I did not test the *cl* part. I added the -pa just by imitation. installPhase = '' mkdir -p $out/bin $out/lib/wings-${version}/ebin diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index a4b526ea25d3..1f98635f15dd 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: +{ lib, stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.4"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz"; }; + # https://github.com/tonyrog/cl/issues/39 + postPatch = '' + substituteInPlace c_src/Makefile \ + --replace "-m64" "" + ''; + buildInputs = [ erlang rebar opencl-headers ocl-icd ]; buildPhase = '' @@ -29,8 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/tonyrog/cl"; description = "OpenCL binding for Erlang"; license = licenses.mit; - # https://github.com/tonyrog/cl/issues/39 - broken = stdenv.isAarch64; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f95f05ecec..a2170af6f1c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19506,9 +19506,7 @@ with pkgs; chromaprint = callPackage ../development/libraries/chromaprint { }; - cl = callPackage ../development/libraries/cl { - erlang = erlangR23; - }; + cl = callPackage ../development/libraries/cl { }; clanlib = callPackage ../development/libraries/clanlib { }; @@ -34389,9 +34387,7 @@ with pkgs; wily = callPackage ../applications/editors/wily { }; - wings = callPackage ../applications/graphics/wings { - erlang = erlangR21; - }; + wings = callPackage ../applications/graphics/wings { }; write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; From bb374eb189197d7eea01b7e2f2026d7f7ae0bed0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 18:50:58 +0200 Subject: [PATCH 18/36] python3Packages.scooby: unbreak --- pkgs/development/python-modules/scooby/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index 0bd037a74fc7..41c2f8c6c16e 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo="; }; + postPatch = '' + # Drop broken version specifier + sed -i '/python_requires/d' setup.py + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ From 0ddc01c5694ee1f80944f2a1f1fa1204638782c1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Mar 2023 19:00:45 +0200 Subject: [PATCH 19/36] glucose: refactor --- .../science/logic/glucose/default.nix | 27 ++++++++++++++----- .../science/logic/glucose/syrup.nix | 24 ----------------- pkgs/top-level/all-packages.nix | 4 ++- 3 files changed, 23 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/science/logic/glucose/syrup.nix diff --git a/pkgs/applications/science/logic/glucose/default.nix b/pkgs/applications/science/logic/glucose/default.nix index b9ca741a3477..5a0873b53f04 100644 --- a/pkgs/applications/science/logic/glucose/default.nix +++ b/pkgs/applications/science/logic/glucose/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib +, stdenv +, fetchurl +, zlib +, enableUnfree ? false +}: + stdenv.mkDerivation rec { - pname = "glucose"; + pname = "glucose" + lib.optionalString enableUnfree "-syrup"; version = "4.1"; src = fetchurl { url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz"; - sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji"; + hash = "sha256-Uaoc8b7SsU8VQ7CZ6FpW3RqSvjfm4+sMSh/Yg9XMUCk="; }; + sourceRoot = "glucose-syrup-${version}/${if enableUnfree then "parallel" else "simp"}"; + postPatch = '' substituteInPlace Main.cc \ --replace "defined(__linux__)" "defined(__linux__) && defined(__x86_64__)" @@ -15,17 +23,22 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - sourceRoot = "glucose-syrup-${version}/simp"; makeFlags = [ "r" ]; + installPhase = '' - install -Dm0755 glucose_release $out/bin/glucose + runHook preInstall + + install -Dm0755 ${pname}_release $out/bin/${pname} mkdir -p "$out/share/doc/${pname}-${version}/" install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" + + runHook postInstall ''; meta = with lib; { - description = "Modern, parallel SAT solver (sequential version)"; - license = licenses.mit; + description = "Modern, parallel SAT solver (${if enableUnfree then "parallel" else "sequential"} version)"; + homepage = "https://www.labri.fr/perso/lsimon/research/glucose/"; + license = if enableUnfree then licenses.unfreeRedistributable else licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/applications/science/logic/glucose/syrup.nix b/pkgs/applications/science/logic/glucose/syrup.nix deleted file mode 100644 index 17342858fb8f..000000000000 --- a/pkgs/applications/science/logic/glucose/syrup.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, zlib, glucose }: -stdenv.mkDerivation rec { - pname = "glucose-syrup"; - version = glucose.version; - - src = glucose.src; - - buildInputs = [ zlib ]; - - sourceRoot = "glucose-syrup-${version}/parallel"; - makeFlags = [ "r" ]; - installPhase = '' - install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup - mkdir -p "$out/share/doc/${pname}-${version}/" - install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${pname}-${version}/" - ''; - - meta = with lib; { - description = "Modern, parallel SAT solver (parallel version)"; - license = licenses.unfreeRedistributable; - platforms = platforms.unix; - maintainers = with maintainers; [ gebner ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0f95f05ecec..292677cbfc76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37281,7 +37281,9 @@ with pkgs; glom = callPackage ../applications/misc/glom { }; glucose = callPackage ../applications/science/logic/glucose { }; - glucose-syrup = callPackage ../applications/science/logic/glucose/syrup.nix { }; + glucose-syrup = callPackage ../applications/science/logic/glucose { + enableUnfree = true; + }; hol = callPackage ../applications/science/logic/hol { }; From c03e56b8e6e2ecf6047445c8f3c737143c8a315f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 18 Mar 2023 18:32:09 +0100 Subject: [PATCH 20/36] python3Packages.pywlroots: add qtile to passthru.tests --- pkgs/development/python-modules/pywlroots/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 53f583cc7c28..68a4753ba06d 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -15,6 +15,7 @@ , xkbcommon , xorg , pytestCheckHook +, qtile }: buildPythonPackage rec { @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "wlroots" ]; + passthru.tests = { inherit qtile; }; + meta = with lib; { homepage = "https://github.com/flacjacket/pywlroots"; description = "Python bindings to wlroots using cffi"; From 0e7ee9c4b2021451c3da43fb7b7180b07edc8fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 18 Mar 2023 18:45:19 +0100 Subject: [PATCH 21/36] viceroy: 0.3.5 -> 0.4.0 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 11dfd22d51d3..67fe882f6997 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-X+RmsS+GxdBiFt2Fo0MgkuyjQDwQNuOLDL1YVQdqhXo="; + hash = "sha256-6D+P7fQBhLYuAw9bIVgEU4Zi18kBLUn/4jr1E8cFugU="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-vbhBlfHrFcjtaUJHYvB106ElYP0NquOo+rgIx9cWenY="; + cargoHash = "sha256-URBtmMR61K1/LtIt3Q3tfQ4viZPvoiumR2LudcpYk6s="; cargoTestFlags = [ "--package viceroy-lib" From 891812fd2b5254abd253d987062205119e115077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sat, 18 Mar 2023 18:53:54 +0100 Subject: [PATCH 22/36] fastly: 8.0.0 -> 8.1.0 --- pkgs/misc/fastly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 743d8cd1c5f2..f55d2d2cf227 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Bwof1Np0eSjmBXQ6dqFmw3TA/2u+VzzyIn/95m9eXVo="; + hash = "sha256-4RynQS3Y+Aa93hYWyvZSkAq2teUKJhqAn8NSvnEEdzE="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-/tdvIX839NkhUoj/bfJ/68K8RtPCidydNQZCdDvizzU="; + vendorHash = "sha256-XND6sSjbZCTraKOapAvsVOZGf27YcyFnkC1vl8wO0ug="; nativeBuildInputs = [ installShellFiles From e5005453d3315aa58a04b901cbecbef5e241f7b1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 18 Mar 2023 15:54:49 -0300 Subject: [PATCH 23/36] vscode-extensions: refactor of extensions (#221878) * vscode-extensions: fix indentation for editorconfig * vscode-extensions.chenglou92.rescript-vscode: renamed directory * vscode-extensions.WakaTime.vscode-wakatime: rename directory * vscode-extensions.hashicorp.terraform: rename directory * vscode-extensions.ms-python.python: rename directory * vscode-extensions.sumneko.lua: rename directory * vscode-extensions.ms-vscode.cpptools: rename directory * vscode-extensions.ms-vscode-remote.remote-ssh: rename directory * vscode-extensions.rust-lang.rust-analyzer: rename directory * vscode-extensions.vadimcn.vscode-lldb: rename directory * vscode-extensions.ms-dotnettools.csharp: rename directory * vscode-extensions.ms-vsliveshare.vsliveshare: rename directory * vscode-extensions.ms-toolsai.jupyter: rename directory --- .../default.nix | 0 .../default.nix | 0 .../rescript-editor-analysis.nix | 0 .../editors/vscode/extensions/default.nix | 30 +++++++++---------- .../default.nix | 0 .../fix-terraform-ls.patch | 0 .../default.nix | 0 .../{python => ms-python.python}/default.nix | 0 .../default.nix | 0 .../default.nix | 0 .../default.nix | 0 .../missing_elf_deps.sh | 0 .../package-activation-events.json | 0 .../update_helper.sh | 0 .../default.nix | 0 .../build-deps/package.json | 0 .../default.nix | 0 .../update.sh | 0 .../{lua => sumneko.lua}/default.nix | 0 .../{lua => sumneko.lua}/remove-chmod.patch | 0 .../build-deps/default.nix | 0 .../build-deps/node-env.nix | 0 .../build-deps/node-packages.nix | 0 .../cmake-build-extension-only.patch | 0 .../default.nix | 0 .../fix-python-installation.patch | 0 .../lldb.nix | 0 .../update.sh | 0 .../vscode/extensions/vscode-utils.nix | 4 +-- 29 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/applications/editors/vscode/extensions/{wakatime => WakaTime.vscode-wakatime}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rescript => chenglou92.rescript-vscode}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rescript => chenglou92.rescript-vscode}/rescript-editor-analysis.nix (100%) rename pkgs/applications/editors/vscode/extensions/{terraform => hashicorp.terraform}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{terraform => hashicorp.terraform}/fix-terraform-ls.patch (100%) rename pkgs/applications/editors/vscode/extensions/{ms-dotnettools-csharp => ms-dotnettools.csharp}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{python => ms-python.python}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{ms-toolsai-jupyter => ms-toolsai.jupyter}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{remote-ssh => ms-vscode-remote.remote-ssh}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/missing_elf_deps.sh (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/package-activation-events.json (100%) rename pkgs/applications/editors/vscode/extensions/{cpptools => ms-vscode.cpptools}/update_helper.sh (100%) rename pkgs/applications/editors/vscode/extensions/{ms-vsliveshare-vsliveshare => ms-vsliveshare.vsliveshare}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/build-deps/package.json (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{rust-analyzer => rust-lang.rust-analyzer}/update.sh (100%) rename pkgs/applications/editors/vscode/extensions/{lua => sumneko.lua}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{lua => sumneko.lua}/remove-chmod.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/node-env.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/build-deps/node-packages.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/cmake-build-extension-only.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/default.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/fix-python-installation.patch (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/lldb.nix (100%) rename pkgs/applications/editors/vscode/extensions/{vscode-lldb => vadimcn.vscode-lldb}/update.sh (100%) diff --git a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/wakatime/default.nix rename to pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rescript/default.nix rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix rename to pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 82087a7d2c2e..a888eb3695f4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -635,7 +635,7 @@ let }; }; - chenglou92.rescript-vscode = callPackage ./rescript { }; + chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1416,7 +1416,7 @@ let }; }; - hashicorp.terraform = callPackage ./terraform { }; + hashicorp.terraform = callPackage ./hashicorp.terraform { }; hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1930,7 +1930,7 @@ let ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs - ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; + ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { }; ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1944,7 +1944,7 @@ let }; }; - ms-vscode.cpptools = callPackage ./cpptools { }; + ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1996,7 +1996,7 @@ let }; }; - ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2031,7 +2031,7 @@ let }; }; - ms-python.python = callPackage ./python { }; + ms-python.python = callPackage ./ms-python.python { }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2069,7 +2069,7 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai-jupyter {}; + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {}; ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2257,7 +2257,7 @@ let }; }; - rust-lang.rust-analyzer = callPackage ./rust-analyzer { }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { @@ -2648,7 +2648,7 @@ let }; }; - sumneko.lua = callPackage ./lua { }; + sumneko.lua = callPackage ./sumneko.lua { }; svelte.svelte-vscode = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2858,7 +2858,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vscode-lldb { llvmPackages = llvmPackages_14; }; + vadimcn.vscode-lldb = callPackage ./vadimcn.vscode-lldb { llvmPackages = llvmPackages_14; }; valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { @@ -2868,9 +2868,9 @@ let }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; - sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; + sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; }; nativeBuildInputs = [ jq moreutils ]; @@ -2914,7 +2914,7 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; vscjava.vscode-java-debug = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3119,7 +3119,7 @@ let }; }; - WakaTime.vscode-wakatime = callPackage ./wakatime { }; + WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/terraform/default.nix rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch rename to pkgs/applications/editors/vscode/extensions/hashicorp.terraform/fix-terraform-ls.patch diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/python/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/missing_elf_deps.sh diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/package-activation-events.json diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh rename to pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh rename to pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh diff --git a/pkgs/applications/editors/vscode/extensions/lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/lua/default.nix rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch b/pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/lua/remove-chmod.patch rename to pkgs/applications/editors/vscode/extensions/sumneko.lua/remove-chmod.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/default.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-env.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-env.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/node-packages.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/node-packages.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/cmake-build-extension-only.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/fix-python-installation.patch rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/fix-python-installation.patch diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix diff --git a/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh similarity index 100% rename from pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh rename to pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/update.sh diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index eff075c49398..0eba230ad8e0 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -87,8 +87,8 @@ let builtins.map extensionFromVscodeMarketplace mktplcExtRefList; vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { - inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; - vscodeDefault = vscode; + inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; + vscodeDefault = vscode; }; vscodeExts2nix = import ./vscodeExts2nix.nix { From d0661c9406eed2766eb8b28b74ce97bdd4d53756 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 18 Mar 2023 11:50:58 +0100 Subject: [PATCH 24/36] vimPlugins.sniprun: 1.2.8 -> 1.2.13 --- pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9348e599a6e1..a418f4655deb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -796,18 +796,18 @@ self: super: { sniprun = let - version = "1.2.8"; + version = "1.2.13"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "v${version}"; - sha256 = "sha256-iPZ0DPAErkMJIn85t1FIiGhLcMZlL06iNKLqmRu7gXI="; + hash = "sha256-VDLBktZChRgorJt/V/wuFQn/SL4yOZIElmntEQEi8Tc="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - cargoSha256 = "sha256-HZEh6jtuRqsyjyDbDIV38x2N1unbSu24D8vrPZ17ktE="; + cargoSha256 = "sha256-cJwmuwsC81fSH36TRU7xGzlR4pVdjsw73uRaH1uWY+0="; nativeBuildInputs = [ makeWrapper ]; From 5686f0064d5f36e7f39984ea9232b42c1104bf1e Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 19 Feb 2023 13:01:18 -0500 Subject: [PATCH 25/36] rustPlatform.importCargoLock: add support for git dependencies that use workspace inheritance Rust 1.64.0 added support for workspace inheritance, which allows for crates to inherit values such as dependency version constraints or package metadata information from their workspaces [0]. This works by having workspace members specify a value as a table, with `workspace` set to true. Thus, supporting this in importCargoLock is as simple as walking the crate's Cargo.toml, replacing inherited values with their workspace counterpart. This is also what a forthcoming Cargo release will do for `cargo vendor` [1], but we can get ahead of it ;) [0]: https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html#cargo-improvements-workspace-inheritance-and-multi-target-builds [1]: https://github.com/rust-lang/cargo/pull/11414 --- pkgs/build-support/rust/import-cargo-lock.nix | 12 ++- .../rust/replace-workspace-values.py | 95 +++++++++++++++++++ .../rust/test/import-cargo-lock/default.nix | 7 +- .../crate.toml | 6 ++ .../default.nix | 7 ++ .../want.toml | 12 +++ .../workspace.toml | 5 + 7 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/rust/replace-workspace-values.py create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml create mode 100644 pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml diff --git a/pkgs/build-support/rust/import-cargo-lock.nix b/pkgs/build-support/rust/import-cargo-lock.nix index 9ff9c2f6289c..1c739933af16 100644 --- a/pkgs/build-support/rust/import-cargo-lock.nix +++ b/pkgs/build-support/rust/import-cargo-lock.nix @@ -1,4 +1,4 @@ -{ fetchgit, fetchurl, lib, runCommand, cargo, jq }: +{ fetchgit, fetchurl, lib, writers, python3Packages, runCommand, cargo, jq }: { # Cargo lock file @@ -93,6 +93,11 @@ let sha256 = checksum; }; + # Replaces values inherited by workspace members. + replaceWorkspaceValues = writers.writePython3 "replace-workspace-values" + { libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; } + (builtins.readFile ./replace-workspace-values.py); + # Fetch and unpack a crate. mkCrate = pkg: let @@ -171,6 +176,11 @@ let cp -prvd "$tree/" $out chmod u+w $out + if grep -q workspace "$out/Cargo.toml"; then + chmod u+w "$out/Cargo.toml" + ${replaceWorkspaceValues} "$out/Cargo.toml" "${tree}/Cargo.toml" + fi + # Cargo is happy with empty metadata. printf '{"files":{},"package":null}' > "$out/.cargo-checksum.json" diff --git a/pkgs/build-support/rust/replace-workspace-values.py b/pkgs/build-support/rust/replace-workspace-values.py new file mode 100644 index 000000000000..fe5462883302 --- /dev/null +++ b/pkgs/build-support/rust/replace-workspace-values.py @@ -0,0 +1,95 @@ +# This script implements the workspace inheritance mechanism described +# here: https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table +# +# Please run `mypy --strict`, `black`, and `isort --profile black` on this after editing, thanks! + +import sys +from typing import Any + +import tomli +import tomli_w + + +def load_file(path: str) -> dict[str, Any]: + with open(path, "rb") as f: + return tomli.load(f) + + +def replace_key( + workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str +) -> bool: + if "workspace" in table[key] and table[key]["workspace"] is True: + print("replacing " + key) + + replaced = table[key] + del replaced["workspace"] + + workspace_copy = workspace_manifest[section][key] + + if section == "dependencies": + crate_features = replaced.get("features") + + if type(workspace_copy) is str: + replaced["version"] = workspace_copy + else: + replaced.update(workspace_copy) + + merged_features = (crate_features or []) + ( + workspace_copy.get("features") or [] + ) + + if len(merged_features) > 0: + # Dictionaries are guaranteed to be ordered (https://stackoverflow.com/a/7961425) + replaced["features"] = list(dict.fromkeys(merged_features)) + elif section == "package": + table[key] = replaced = workspace_copy + + return True + + return False + + +def replace_dependencies( + workspace_manifest: dict[str, Any], root: dict[str, Any] +) -> bool: + changed = False + + for key in ["dependencies", "dev-dependencies", "build-dependencies"]: + if key in root: + for k in root[key].keys(): + changed |= replace_key(workspace_manifest, root[key], "dependencies", k) + + return changed + + +def main() -> None: + crate_manifest = load_file(sys.argv[1]) + workspace_manifest = load_file(sys.argv[2])["workspace"] + + if "workspace" in crate_manifest: + return + + changed = False + + for key in crate_manifest["package"].keys(): + changed |= replace_key( + workspace_manifest, crate_manifest["package"], "package", key + ) + + changed |= replace_dependencies(workspace_manifest, crate_manifest) + + if "target" in crate_manifest: + for key in crate_manifest["target"].keys(): + changed |= replace_dependencies( + workspace_manifest, crate_manifest["target"][key] + ) + + if not changed: + return + + with open(sys.argv[1], "wb") as f: + tomli_w.dump(crate_manifest, f) + + +if __name__ == "__main__": + main() diff --git a/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/default.nix index 74be68b2c356..f399107eb982 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, writers, python3Packages }: # Build like this from nixpkgs root: # $ nix-build -A tests.importCargoLock @@ -12,4 +12,9 @@ gitDependencyBranch = callPackage ./git-dependency-branch { }; maturin = callPackage ./maturin { }; v1 = callPackage ./v1 { }; + gitDependencyWorkspaceInheritance = callPackage ./git-dependency-workspace-inheritance { + replaceWorkspaceValues = writers.writePython3 "replace-workspace-values" + { libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; } + (builtins.readFile ../../replace-workspace-values.py); + }; } diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml new file mode 100644 index 000000000000..a50855706dff --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml @@ -0,0 +1,6 @@ +[package] +version = { workspace = true } + +[dependencies] +foo = { workspace = true, features = ["cat"] } +bar = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix new file mode 100644 index 000000000000..138b7179b95f --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/default.nix @@ -0,0 +1,7 @@ +{ replaceWorkspaceValues, runCommand }: + +runCommand "git-dependency-workspace-inheritance-test" { } '' + cp --no-preserve=mode ${./crate.toml} "$out" + ${replaceWorkspaceValues} "$out" ${./workspace.toml} + diff -u "$out" ${./want.toml} +'' diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml new file mode 100644 index 000000000000..3c11228e97c2 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml @@ -0,0 +1,12 @@ +[package] +version = "1.0.0" + +[dependencies] +bar = "1.0.0" + +[dependencies.foo] +features = [ + "cat", + "meow", +] +version = "1.0.0" diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml new file mode 100644 index 000000000000..c58112a782d0 --- /dev/null +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/workspace.toml @@ -0,0 +1,5 @@ +[workspace.package] +version = "1.0.0" + +[workspace.dependencies] +foo = { version = "1.0.0", features = ["meow"] } From 4ba9fc5008b06c59d3fff795db897df4b2d0e382 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 19 Feb 2023 23:50:04 -0500 Subject: [PATCH 26/36] ruff: 0.0.244 -> 0.0.248 https://github.com/charliermarsh/ruff/releases/tag/v0.0.245 https://github.com/charliermarsh/ruff/releases/tag/v0.0.246 https://github.com/charliermarsh/ruff/releases/tag/v0.0.247 https://github.com/charliermarsh/ruff/releases/tag/v0.0.248 --- pkgs/development/tools/ruff/Cargo.lock | 3208 +++++++++++++++++++++++ pkgs/development/tools/ruff/default.nix | 16 +- 2 files changed, 3221 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/ruff/Cargo.lock diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock new file mode 100644 index 000000000000..4659863e0fa8 --- /dev/null +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -0,0 +1,3208 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "annotate-snippets" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" + +[[package]] +name = "annotate-snippets" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anyhow" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + +[[package]] +name = "assert_cmd" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" +dependencies = [ + "bstr 1.2.0", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bisection" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021e079a1bab0ecce6cf4b4b74c0c37afa4a697136eb3b127875c84a8f04a8c3" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + +[[package]] +name = "bstr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +dependencies = [ + "memchr", + "once_cell", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "cachedir" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e236bf5873ea57ec2877445297f4da008916bfae51567131acfc54a073d694f3" +dependencies = [ + "tempfile", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chic" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b5db619f3556839cb2223ae86ff3f9a09da2c5013be42bc9af08c9589bf70c" +dependencies = [ + "annotate-snippets 0.6.1", +] + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "ciborium" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" + +[[package]] +name = "ciborium-ll" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "bitflags", + "clap_lex 0.2.4", + "indexmap", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex 0.3.1", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_complete" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +dependencies = [ + "clap 4.1.6", +] + +[[package]] +name = "clap_complete_command" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31" +dependencies = [ + "clap 4.1.6", + "clap_complete", + "clap_complete_fig", +] + +[[package]] +name = "clap_complete_fig" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf0c76d8fcf782a1102ccfcd10ca8246e7fdd609c1cd6deddbb96cb638e9bb5c" +dependencies = [ + "clap 4.1.6", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clearscreen" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41aa24cc5e1d6b3fc49ad4cd540b522fedcbe88bc6f259ff16e20e7010b6f8c7" +dependencies = [ + "nix", + "terminfo", + "thiserror", + "which", + "winapi", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "configparser" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5458d9d1a587efaf5091602c59d299696a3877a439c8f6d461a2d3cce11df87a" + +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "console_log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +dependencies = [ + "log", + "web-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap 3.2.23", + "criterion-plot", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cxx" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "drop_bomb" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" + +[[package]] +name = "dyn-clone" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "ena" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" +dependencies = [ + "log", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fern" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +dependencies = [ + "log", +] + +[[package]] +name = "filetime" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.45.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flake8-to-ruff" +version = "0.0.248" +dependencies = [ + "anyhow", + "clap 4.1.6", + "colored", + "configparser", + "once_cell", + "regex", + "ruff", + "rustc-hash", + "serde", + "serde_json", + "strum", + "strum_macros", + "toml", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr 1.2.0", + "fnv", + "log", + "regex", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "imperative" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398" +dependencies = [ + "phf", + "rust-stemmers", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "insta" +version = "1.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "pest", + "pest_derive", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] + +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "joinery" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "lalrpop" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" +dependencies = [ + "ascii-canvas", + "atty", + "bit-set", + "diff", + "ena", + "itertools", + "lalrpop-util", + "petgraph", + "pico-args", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" +dependencies = [ + "regex", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libcst" +version = "0.1.0" +source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177" +dependencies = [ + "chic", + "itertools", + "libcst_derive", + "once_cell", + "paste", + "peg", + "regex", + "thiserror", +] + +[[package]] +name = "libcst_derive" +version = "0.1.0" +source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lz4_flex" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.42.0", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nextest-workspace-hack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "static_assertions", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + +[[package]] +name = "notify" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +dependencies = [ + "bitflags", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.42.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "path-absolutize" +version = "3.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1d4993b16f7325d90c18c3c6a3327db7808752db8d208cea0acee0abd52c52" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a81540d94551664b72b72829b12bd167c73c9d25fbac0e04fafa8023f7e4901" +dependencies = [ + "once_cell", +] + +[[package]] +name = "peg" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared 0.11.1", +] + +[[package]] +name = "phf_codegen" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" +dependencies = [ + "phf_generator", + "phf_shared 0.11.1", +] + +[[package]] +name = "phf_generator" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +dependencies = [ + "phf_shared 0.11.1", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "itertools", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-junit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b909fe9bf2abb1e3d6a97c9189a37c8105c61d03dca9ce6aace023e7d682bd" +dependencies = [ + "chrono", + "indexmap", + "nextest-workspace-hack", + "quick-xml", + "thiserror", + "uuid", +] + +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[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.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "ruff" +version = "0.0.248" +dependencies = [ + "anyhow", + "bisection", + "bitflags", + "cfg-if", + "chrono", + "clap 4.1.6", + "colored", + "console_error_panic_hook", + "console_log", + "criterion", + "dirs", + "fern", + "getrandom", + "glob", + "globset", + "ignore", + "imperative", + "insta", + "is_executable", + "itertools", + "js-sys", + "libcst", + "log", + "natord", + "nohash-hasher", + "num-bigint", + "num-traits", + "once_cell", + "path-absolutize", + "regex", + "ruff_macros", + "ruff_python", + "rustc-hash", + "rustpython-common", + "rustpython-parser", + "schemars", + "semver", + "serde", + "serde-wasm-bindgen", + "shellexpand", + "smallvec", + "strum", + "strum_macros", + "test-case", + "textwrap", + "thiserror", + "titlecase", + "toml", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "ruff_cli" +version = "0.0.248" +dependencies = [ + "annotate-snippets 0.9.1", + "anyhow", + "assert_cmd", + "atty", + "bincode", + "bitflags", + "cachedir", + "chrono", + "clap 4.1.6", + "clap_complete_command", + "clearscreen", + "colored", + "filetime", + "glob", + "ignore", + "itertools", + "log", + "mimalloc", + "notify", + "path-absolutize", + "quick-junit", + "rayon", + "regex", + "ruff", + "rustc-hash", + "serde", + "serde_json", + "similar", + "strum", + "textwrap", + "tikv-jemallocator", + "ureq", + "walkdir", +] + +[[package]] +name = "ruff_dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap 4.1.6", + "itertools", + "libcst", + "once_cell", + "regex", + "ruff", + "ruff_cli", + "rustpython-common", + "rustpython-parser", + "schemars", + "serde_json", + "strum", + "strum_macros", + "textwrap", +] + +[[package]] +name = "ruff_formatter" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "insta", + "ruff_text_size", + "rustc-hash", + "schemars", + "serde", + "tracing", + "unicode-width", +] + +[[package]] +name = "ruff_macros" +version = "0.0.0" +dependencies = [ + "itertools", + "proc-macro2", + "quote", + "syn", + "textwrap", +] + +[[package]] +name = "ruff_python" +version = "0.0.0" +dependencies = [ + "once_cell", + "regex", + "rustc-hash", +] + +[[package]] +name = "ruff_python_formatter" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap 4.1.6", + "insta", + "once_cell", + "ruff_formatter", + "ruff_text_size", + "rustc-hash", + "rustpython-common", + "rustpython-parser", + "test-case", +] + +[[package]] +name = "ruff_text_size" +version = "0.0.0" +dependencies = [ + "schemars", + "serde", + "serde_test", + "static_assertions", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustpython-ast" +version = "0.2.0" +source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +dependencies = [ + "num-bigint", + "rustpython-compiler-core", +] + +[[package]] +name = "rustpython-common" +version = "0.2.0" +source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +dependencies = [ + "ascii", + "bitflags", + "cfg-if", + "hexf-parse", + "itertools", + "lexical-parse-float", + "libc", + "lock_api", + "num-bigint", + "num-complex", + "num-traits", + "once_cell", + "radium", + "rand", + "siphasher", + "unic-ucd-category", + "volatile", + "widestring", +] + +[[package]] +name = "rustpython-compiler-core" +version = "0.2.0" +source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +dependencies = [ + "bincode", + "bitflags", + "bstr 0.2.17", + "itertools", + "lz4_flex", + "num-bigint", + "num-complex", + "num_enum", + "serde", + "thiserror", +] + +[[package]] +name = "rustpython-parser" +version = "0.2.0" +source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +dependencies = [ + "ahash", + "anyhow", + "itertools", + "lalrpop", + "lalrpop-util", + "log", + "num-bigint", + "num-traits", + "phf", + "phf_codegen", + "rustc-hash", + "rustpython-ast", + "rustpython-compiler-core", + "thiserror", + "tiny-keccak", + "unic-emoji-char", + "unic-ucd-ident", + "unicode_names2", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schemars" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_derive_internals" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shellexpand" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1" +dependencies = [ + "dirs", +] + +[[package]] +name = "similar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smawk" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_cache" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminfo" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +dependencies = [ + "dirs", + "fnv", + "nom", + "phf", + "phf_codegen", +] + +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + +[[package]] +name = "test-case" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-macros" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" +dependencies = [ + "cfg-if", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.3+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "titlecase" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042" +dependencies = [ + "joinery", + "lazy_static", + "regex", +] + +[[package]] +name = "toml" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "serde", + "serde_spanned", + "toml_datetime", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-emoji-char" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-category" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +dependencies = [ + "matches", + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-linebreak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" +dependencies = [ + "hashbrown", + "regex", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_names2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "ureq" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "url", + "webpki", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "volatile" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[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.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "web-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +[[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-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[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-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 541ce48bdc9a..27dddf233f7e 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,24 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.244"; + version = "0.0.248"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oQBNVs7hoiXNqz5lYq5YNKHfpQ/c8LZAvNvtFqpTM2E="; + hash = "sha256-qsjn8AW6Wx0ZaTht9BToQxYWngrrrR8LIIWcNfr8fXw="; }; - cargoSha256 = "sha256-61kypAXWfUZLfTbSp+b0gCKwuWtxAYVtKIwfVOcJ2o8="; + # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace + # inheritance within Git dependencies, but importCargoLock does. + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libcst-0.1.0" = "sha256-66Td5jnLEEDHgYapsSmxfgIE43T7PSTYRznllIOw81U="; + "rustpython-ast-0.2.0" = "sha256-k2WHnRtqSzdawHQKOfTjvyZxgRWXRv9dvSzfYC7171o="; + }; + }; nativeBuildInputs = [ installShellFiles @@ -27,6 +35,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; + cargoBuildFlags = [ "--package=ruff_cli" ]; + # building tests fails with `undefined symbols` doCheck = false; From ffd48ee04d11a87b36bae3ac7cf4806c8a0639f2 Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 19 Feb 2023 16:37:28 -0500 Subject: [PATCH 27/36] matrix-conduit: use importCargoLock instead of hacky patch As `cargo vendor` currently doesn't support workspace inherited manifest values, a patch that replaced the values manually was used as a workaround. Now that importCargoLock has support for this, and we're probably going to move towards it anyways, let's switch to it now, as there's a clear benefit either way. This also switches to using our copy of SQLite instead of the vendored one included in `libsqlite3-sys` -- because it's preferred, but also because it causes the build to fail, now that dependencies are read-only. --- pkgs/servers/matrix-conduit/Cargo.lock | 3398 +++++++++++++++++ .../cargo-11192-workaround.patch | 259 -- pkgs/servers/matrix-conduit/default.nix | 29 +- 3 files changed, 3416 insertions(+), 270 deletions(-) create mode 100644 pkgs/servers/matrix-conduit/Cargo.lock delete mode 100644 pkgs/servers/matrix-conduit/cargo-11192-workaround.patch diff --git a/pkgs/servers/matrix-conduit/Cargo.lock b/pkgs/servers/matrix-conduit/Cargo.lock new file mode 100644 index 000000000000..e77389240871 --- /dev/null +++ b/pkgs/servers/matrix-conduit/Cargo.lock @@ -0,0 +1,3398 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom 0.2.8", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "arc-swap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "assign" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" + +[[package]] +name = "async-compression" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-server" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8456dab8f11484979a86651da8e619b355ede5d61a160755155f6c344bd18c47" +dependencies = [ + "arc-swap", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "rustls", + "rustls-pemfile 1.0.1", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.59.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "blake2b_simd" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + +[[package]] +name = "bytemuck" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-sys" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "once_cell", +] + +[[package]] +name = "clap_derive" +version = "4.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "conduit" +version = "0.5.0" +dependencies = [ + "async-trait", + "axum", + "axum-server", + "base64 0.13.1", + "bytes", + "clap", + "crossbeam", + "directories", + "figment", + "futures-util", + "heed", + "hmac", + "http", + "image", + "jsonwebtoken", + "lazy_static", + "lru-cache", + "num_cpus", + "opentelemetry", + "opentelemetry-jaeger", + "parking_lot", + "persy", + "rand 0.8.5", + "regex", + "reqwest", + "ring", + "rocksdb", + "ruma", + "rusqlite", + "rust-argon2", + "sd-notify", + "serde", + "serde_json", + "serde_yaml", + "sha-1", + "thiserror", + "thread_local", + "threadpool", + "tikv-jemalloc-ctl", + "tikv-jemallocator", + "tokio", + "tower", + "tower-http", + "tracing", + "tracing-flame", + "tracing-opentelemetry", + "tracing-subscriber", + "trust-dns-resolver", +] + +[[package]] +name = "const-oid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + +[[package]] +name = "der" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +dependencies = [ + "const-oid", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer 0.10.3", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "ed25519" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +dependencies = [ + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand 0.7.3", + "serde", + "sha2", + "zeroize", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "figment" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9" +dependencies = [ + "atomic", + "pear", + "serde", + "toml", + "uncased", + "version_check", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "futures" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "h2" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "heed" +version = "0.10.6" +source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" +dependencies = [ + "bytemuck", + "byteorder", + "heed-traits", + "heed-types", + "libc", + "lmdb-rkv-sys", + "once_cell", + "page_size", + "serde", + "synchronoise", + "url", +] + +[[package]] +name = "heed-traits" +version = "0.7.0" +source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" + +[[package]] +name = "heed-types" +version = "0.7.2" +source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" +dependencies = [ + "bincode", + "bytemuck", + "byteorder", + "heed-traits", + "serde", + "serde_json", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" +dependencies = [ + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + +[[package]] +name = "integer-encoding" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" + +[[package]] +name = "ipconfig" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" +dependencies = [ + "socket2", + "widestring", + "winapi", + "winreg 0.10.1", +] + +[[package]] +name = "ipnet" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "js_int" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" +dependencies = [ + "serde", +] + +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + +[[package]] +name = "jsonwebtoken" +version = "8.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa4b4af834c6cfd35d8763d359661b90f2e45d8f750a0849156c7f4671af09c" +dependencies = [ + "base64 0.13.1", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "konst" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330f0e13e6483b8c34885f7e6c9f19b1a7bd449c673fbb948a51c99d66ef74f4" +dependencies = [ + "konst_macro_rules", + "konst_proc_macros", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + +[[package]] +name = "konst_proc_macros" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "984e109462d46ad18314f10e392c286c3d47bce203088a09012de1015b45b737" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.137" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "librocksdb-sys" +version = "6.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +dependencies = [ + "bindgen", + "cc", + "glob", + "libc", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "lmdb-rkv-sys" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b9ce6b3be08acefa3003c57b7565377432a89ec24476bbe72e11d101f852fe" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[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.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.42.0", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" +dependencies = [ + "async-trait", + "futures", + "futures-executor", + "once_cell", + "opentelemetry", + "opentelemetry-semantic-conventions", + "thiserror", + "thrift", + "tokio", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand 0.8.5", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", +] + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "page_size" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.42.0", +] + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[package]] +name = "pear" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "persy" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5511189f4dbd737283b0dd2ff6715f2e35fd0d3e1ddf953ed6a772e439e1f73f" +dependencies = [ + "crc", + "data-encoding", + "fs2", + "linked-hash-map", + "rand 0.8.5", + "thiserror", + "unsigned-varint", + "zigzag", +] + +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "png" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc-macro2-diagnostics" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "version_check", + "yansi", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[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 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "reqwest" +version = "0.11.9" +source = "git+https://github.com/timokoesters/reqwest?rev=57b7cf4feb921573dfafad7d34b9ac6e44ead0bd#57b7cf4feb921573dfafad7d34b9ac6e44ead0bd" +dependencies = [ + "base64 0.13.1", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile 0.2.1", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls", + "tokio-socks", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.7.0", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rocksdb" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "ruma" +version = "0.7.4" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-appservice-api", + "ruma-client-api", + "ruma-common", + "ruma-federation-api", + "ruma-identity-service-api", + "ruma-push-gateway-api", + "ruma-signatures", + "ruma-state-res", +] + +[[package]] +name = "ruma-appservice-api" +version = "0.7.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "js_int", + "ruma-common", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-client-api" +version = "0.15.3" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "assign", + "bytes", + "http", + "js_int", + "js_option", + "maplit", + "percent-encoding", + "ruma-common", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-common" +version = "0.10.5" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "base64 0.20.0", + "bytes", + "form_urlencoded", + "http", + "indexmap", + "itoa", + "js_int", + "js_option", + "konst", + "percent-encoding", + "rand 0.8.5", + "regex", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "uuid", + "wildmatch", +] + +[[package]] +name = "ruma-federation-api" +version = "0.6.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "js_int", + "ruma-common", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-identity-service-api" +version = "0.6.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "js_int", + "ruma-common", + "serde", +] + +[[package]] +name = "ruma-macros" +version = "0.10.5" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "ruma-identifiers-validation", + "serde", + "syn", + "toml", +] + +[[package]] +name = "ruma-push-gateway-api" +version = "0.6.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "js_int", + "ruma-common", + "serde", + "serde_json", +] + +[[package]] +name = "ruma-signatures" +version = "0.12.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "base64 0.20.0", + "ed25519-dalek", + "pkcs8", + "rand 0.7.3", + "ruma-common", + "serde_json", + "sha2", + "subslice", + "thiserror", +] + +[[package]] +name = "ruma-state-res" +version = "0.8.0" +source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26" +dependencies = [ + "itertools", + "js_int", + "ruma-common", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rusqlite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rust-argon2" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9" +dependencies = [ + "base64 0.13.1", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustls" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.1", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sd-notify" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +dependencies = [ + "itoa", + "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 = "serde_yaml" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.6", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if", + "cpufeatures", + "digest 0.9.0", + "opaque-debug", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "subslice" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a8e4809a3bb02de01f1f7faf1ba01a83af9e8eabcd4d31dd6e413d14d56aae" +dependencies = [ + "memchr", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + +[[package]] +name = "synchronoise" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2" +dependencies = [ + "crossbeam-queue", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "thrift" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float", + "threadpool", +] + +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.2+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" +dependencies = [ + "async-compression", + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "trust-dns-proto" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "uncased" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68" + +[[package]] +name = "unsigned-varint" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna 0.3.0", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[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.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +[[package]] +name = "wildmatch" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" + +[[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-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zeroize" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zigzag" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf" +dependencies = [ + "num-traits", +] diff --git a/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch b/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch deleted file mode 100644 index 1a71b210dec8..000000000000 --- a/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff --git ruma-appservice-api/Cargo.toml ruma-appservice-api/Cargo.toml -index b48852c8..8641bc42 100644 ---- ruma-appservice-api/Cargo.toml -+++ ruma-appservice-api/Cargo.toml -@@ -23,11 +23,11 @@ unstable-msc2409 = [] - unstable-msc3202 = [] - - [dependencies] --js_int = { workspace = true, features = ["serde"] } -+js_int = { version = "0.2.2", features = ["serde"] } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } --serde = { workspace = true } --serde_json = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87" } - - [dev-dependencies] --assert_matches = { workspace = true } -+assert_matches = { version = "1.5.0" } - serde_yaml = "0.9.14" -diff --git ruma-client-api/Cargo.toml ruma-client-api/Cargo.toml -index ddd2e44b..5756c055 100644 ---- ruma-client-api/Cargo.toml -+++ ruma-client-api/Cargo.toml -@@ -31,16 +31,16 @@ client = [] - server = [] - - [dependencies] --assign = { workspace = true } -+assign = { version = "1.1.1" } - bytes = "1.0.1" --http = { workspace = true } --js_int = { workspace = true, features = ["serde"] } -+http = { version = "0.2.8" } -+js_int = { version = "0.2.2", features = ["serde"] } - js_option = "0.1.1" --maplit = { workspace = true } -+maplit = { version = "1.0.2" } - percent-encoding = "2.1.0" - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } --serde = { workspace = true } --serde_json = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87" } - - [dev-dependencies] --assert_matches = { workspace = true } -+assert_matches = { version = "1.5.0" } -diff --git ruma-common/Cargo.toml ruma-common/Cargo.toml -index 83f22461..4ba11cfb 100644 ---- ruma-common/Cargo.toml -+++ ruma-common/Cargo.toml -@@ -48,15 +48,15 @@ unstable-sanitize = ["dep:html5ever", "dep:phf"] - unstable-unspecified = [] - - [dependencies] --base64 = { workspace = true } -+base64 = { version = "0.20.0" } - bytes = "1.0.1" - form_urlencoded = "1.0.0" - getrandom = { version = "0.2.6", optional = true } - html5ever = { version = "0.25.2", optional = true } --http = { workspace = true, optional = true } -+http = { version = "0.2.8", optional = true } - indexmap = { version = "1.9.1", features = ["serde"] } - itoa = "1.0.1" --js_int = { workspace = true, features = ["serde"] } -+js_int = { version = "0.2.2", features = ["serde"] } - js_option = "0.1.0" - konst = { version = "0.2.19", features = ["rust_1_64", "alloc"] } - percent-encoding = "2.1.0" -@@ -66,25 +66,25 @@ rand = { version = "0.8.3", optional = true } - regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] } - ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } - ruma-macros = { version = "0.10.5", path = "../ruma-macros" } --serde = { workspace = true } --serde_json = { workspace = true, features = ["raw_value"] } --thiserror = { workspace = true } --tracing = { workspace = true, features = ["attributes"] } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87", features = ["raw_value"] } -+thiserror = { version = "1.0.37" } -+tracing = { version = "0.1.37", default-features = false, features = ["std", "attributes"] } - url = "2.2.2" - uuid = { version = "1.0.0", optional = true, features = ["v4"] } - wildmatch = "2.0.0" - - # dev-dependencies can't be optional, so this is a regular dependency --criterion = { workspace = true, optional = true } -+criterion = { version = "0.4.0", optional = true } - - [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] - js-sys = { version = "0.3", optional = true } - - [dev-dependencies] --assert_matches = { workspace = true } --assign = { workspace = true } --http = { workspace = true } --maplit = { workspace = true } -+assert_matches = { version = "1.5.0" } -+assign = { version = "1.1.1" } -+http = { version = "0.2.8" } -+maplit = { version = "1.0.2" } - trybuild = "1.0.71" - - [[bench]] -diff --git ruma-federation-api/Cargo.toml ruma-federation-api/Cargo.toml -index 380d1ed3..a4508a80 100644 ---- ruma-federation-api/Cargo.toml -+++ ruma-federation-api/Cargo.toml -@@ -26,11 +26,11 @@ unstable-msc3723 = [] - unstable-unspecified = [] - - [dependencies] --js_int = { workspace = true, features = ["serde"] } -+js_int = { version = "0.2.2", features = ["serde"] } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } --serde = { workspace = true } --serde_json = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87" } - - [dev-dependencies] --assert_matches = { workspace = true } --http = { workspace = true } -+assert_matches = { version = "1.5.0" } -+http = { version = "0.2.8" } -diff --git ruma-identifiers-validation/Cargo.toml ruma-identifiers-validation/Cargo.toml -index cd79ba78..28a9cd9e 100644 ---- ruma-identifiers-validation/Cargo.toml -+++ ruma-identifiers-validation/Cargo.toml -@@ -15,5 +15,5 @@ all-features = true - compat = [] - - [dependencies] --js_int = { workspace = true } --thiserror = { workspace = true } -+js_int = { version = "0.2.2" } -+thiserror = { version = "1.0.37" } -diff --git ruma-identity-service-api/Cargo.toml ruma-identity-service-api/Cargo.toml -index 9dd4bc14..6edf1170 100644 ---- ruma-identity-service-api/Cargo.toml -+++ ruma-identity-service-api/Cargo.toml -@@ -19,9 +19,9 @@ client = [] - server = [] - - [dependencies] --js_int = { workspace = true, features = ["serde"] } -+js_int = { version = "0.2.2", features = ["serde"] } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] } --serde = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } - - [dev-dependencies] --serde_json = { workspace = true } -+serde_json = { version = "1.0.87" } -diff --git ruma-macros/Cargo.toml ruma-macros/Cargo.toml -index 70a6a7a6..e86c0631 100644 ---- ruma-macros/Cargo.toml -+++ ruma-macros/Cargo.toml -@@ -23,6 +23,6 @@ proc-macro-crate = "1.0.0" - proc-macro2 = "1.0.24" - quote = "1.0.8" - ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } --serde = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } - syn = { version = "1.0.57", features = ["extra-traits", "full", "visit"] } - toml = "0.5.9" -diff --git ruma-push-gateway-api/Cargo.toml ruma-push-gateway-api/Cargo.toml -index 5d589828..e08144ce 100644 ---- ruma-push-gateway-api/Cargo.toml -+++ ruma-push-gateway-api/Cargo.toml -@@ -20,7 +20,7 @@ client = [] - server = [] - - [dependencies] --js_int = { workspace = true, features = ["serde"] } -+js_int = { version = "0.2.2", features = ["serde"] } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } --serde = { workspace = true } --serde_json = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87" } -diff --git ruma-signatures/Cargo.toml ruma-signatures/Cargo.toml -index dd1c9951..d06bffd9 100644 ---- ruma-signatures/Cargo.toml -+++ ruma-signatures/Cargo.toml -@@ -18,16 +18,16 @@ ring-compat = ["dep:subslice"] - unstable-exhaustive-types = [] - - [dependencies] --base64 = { workspace = true } -+base64 = { version = "0.20.0" } - ed25519-dalek = "1.0.1" - pkcs8 = { version = "0.9.0", features = ["alloc"] } - # because dalek uses an older version of rand_core - rand = { version = "0.7", features = ["getrandom"] } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["canonical-json"] } --serde_json = { workspace = true } -+serde_json = { version = "1.0.87" } - sha2 = "0.9.5" - subslice = { version = "0.2.3", optional = true } --thiserror = { workspace = true } -+thiserror = { version = "1.0.37" } - - [dev-dependencies] --assert_matches = { workspace = true } -+assert_matches = { version = "1.5.0" } -diff --git ruma-state-res/Cargo.toml ruma-state-res/Cargo.toml -index d23556f1..ec6088bc 100644 ---- ruma-state-res/Cargo.toml -+++ ruma-state-res/Cargo.toml -@@ -19,18 +19,18 @@ unstable-exhaustive-types = [] - - [dependencies] - itertools = "0.10.0" --js_int = { workspace = true } -+js_int = { version = "0.2.2" } - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["events"] } --serde = { workspace = true } --serde_json = { workspace = true } --thiserror = { workspace = true } --tracing = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } -+serde_json = { version = "1.0.87" } -+thiserror = { version = "1.0.37" } -+tracing = { version = "0.1.37", default-features = false, features = ["std"] } - - # dev-dependencies can't be optional, so this is a regular dependency --criterion = { workspace = true, optional = true } -+criterion = { version = "0.4.0", optional = true } - - [dev-dependencies] --maplit = { workspace = true } -+maplit = { version = "1.0.2" } - rand = "0.8.3" - ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["unstable-pdu"] } - tracing-subscriber = "0.3.16" -diff --git ruma/Cargo.toml ruma/Cargo.toml -index 0b62cff1..05ce9990 100644 ---- ruma/Cargo.toml -+++ ruma/Cargo.toml -@@ -191,8 +191,8 @@ __ci = [ - ] - - [dependencies] --assign = { workspace = true } --js_int = { workspace = true } -+assign = { version = "1.1.1" } -+js_int = { version = "0.2.2" } - js_option = "0.1.1" - - ruma-common = { version = "0.10.5", path = "../ruma-common" } -@@ -208,4 +208,4 @@ ruma-identity-service-api = { version = "0.6.0", path = "../ruma-identity-servic - ruma-push-gateway-api = { version = "0.6.0", path = "../ruma-push-gateway-api", optional = true } - - [dev-dependencies] --serde = { workspace = true } -+serde = { version = "1.0.147", features = ["derive"] } diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 5f8fe6a2cc20..5540711f62c9 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests, rocksdb_6_23 }: +{ lib, rustPlatform, fetchFromGitLab, pkg-config, sqlite, stdenv, darwin, nixosTests, rocksdb_6_23 }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; @@ -11,22 +11,29 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GSCpmn6XRbmnfH31R9c6QW3/pez9KHPjI99dR+ln0P4="; }; - # https://github.com/rust-lang/cargo/issues/11192 - # https://github.com/ruma/ruma/issues/1441 - postPatch = '' - pushd $cargoDepsCopy - patch -p0 < ${./cargo-11192-workaround.patch} - for p in ruma*; do echo '{"files":{},"package":null}' > $p/.cargo-checksum.json; done - popd - ''; + # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace + # inheritance within Git dependencies, but importCargoLock does. + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "heed-0.10.6" = "sha256-rm02pJ6wGYN4SsAbp85jBVHDQ5ITjZZd+79EC2ubRsY="; + "reqwest-0.11.9" = "sha256-wH/q7REnkz30ENBIK5Rlxnc1F6vOyuEANMHFmiVPaGw="; + "ruma-0.7.4" = "sha256-ztobLdOXSGyK1YcPMMIycO3ZmnjxG5mLkHltf0Fbs8s="; + }; + }; - cargoSha256 = "sha256-WFoupcuaG7f7KYBn/uzbOzlHHLurOyvm5e1lEcinxC8="; + # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite. + preBuild = '' + substituteInPlace Cargo.toml --replace "features = [\"bundled\"]" "features = []" + cargo update --offline -p rusqlite + ''; nativeBuildInputs = [ rustPlatform.bindgenHook + pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 4054db2f358c69b7051568e48076c78453d3f248 Mon Sep 17 00:00:00 2001 From: Yuu Yin <86538850+yuuyins@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:36:41 -0300 Subject: [PATCH 28/36] zrythm: 1.0.0-beta.4.5.62 -> 1.0.0-beta.4.6.3 (#221681) Co-authored-by: Sandro --- pkgs/applications/audio/zrythm/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index fbb040709ab5..953a97ac67f8 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -27,6 +27,7 @@ , help2man , jq , json-glib +, kissfft , libadwaita , libaudec , libbacktrace @@ -86,13 +87,13 @@ let }); in stdenv.mkDerivation rec { pname = "zrythm"; - version = "1.0.0-beta.4.5.62"; + version = "1.0.0-beta.4.6.3"; src = fetchFromSourcehut { owner = "~alextee"; repo = pname; rev = "v${version}"; - hash = "sha256-K93Y4Adh9TqoetSn7nrbbruIri1MKYoSGzoRBGHwbPA="; + hash = "sha256-5GBr8N+GzbptrvP/NisBXT0dsl9vn537B4InB00/N+A="; }; nativeBuildInputs = [ @@ -135,6 +136,7 @@ in stdenv.mkDerivation rec { gtksourceview5 guile json-glib + kissfft libadwaita libbacktrace libcyaml @@ -213,7 +215,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zrythm.org"; description = "Automated and intuitive digital audio workstation"; - maintainers = with maintainers; [ tshaynik magnetophon ]; + maintainers = with maintainers; [ tshaynik magnetophon yuu ]; platforms = platforms.linux; license = licenses.agpl3Plus; }; From 9ec72407a4e81c31387132d62993161a0ca58eaa Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:40:30 -0300 Subject: [PATCH 29/36] vscode-extensions: remove 'with' and normalize lib usage * Remove 'with'. Reasoning: https://github.com/atorres1985-contrib/nixpkgs/commit/451dfa6d84586b5cb83e6a7254689dff66b4523a * Normalize lib usage in vscode-extensions. --- .../WakaTime.vscode-wakatime/default.nix | 4 +- .../chenglou92.rescript-vscode/default.nix | 6 +- .../rescript-editor-analysis.nix | 6 +- .../editors/vscode/extensions/default.nix | 601 +++++++++--------- .../hashicorp.terraform/default.nix | 6 +- .../extensions/jebbs.plantuml/default.nix | 6 +- .../ms-dotnettools.csharp/default.nix | 6 +- .../extensions/ms-python.python/default.nix | 6 +- .../extensions/ms-toolsai.jupyter/default.nix | 6 +- .../ms-vscode-remote.remote-ssh/default.nix | 6 +- .../extensions/ms-vscode.cpptools/default.nix | 6 +- .../ms-vsliveshare.vsliveshare/default.nix | 6 +- .../rust-lang.rust-analyzer/default.nix | 8 +- .../vscode/extensions/sumneko.lua/default.nix | 6 +- .../vadimcn.vscode-lldb/default.nix | 8 +- 15 files changed, 344 insertions(+), 343 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 554b2bddb6ca..a58a17f2a6fe 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -12,11 +12,11 @@ in sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; - meta = with lib; { + meta = { description = '' Visual Studio Code plugin for automatic time tracking and metrics generated from your programming activity ''; - license = licenses.bsd3; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 1f92e600f40f..76af53164faa 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -20,10 +20,10 @@ vscode-utils.buildVscodeMarketplaceExtension rec { ln -s ${rescript-editor-analysis}/bin ${analysisDir} ''; - meta = with lib; { + meta = { description = "The official VSCode plugin for ReScript"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = with maintainers; [ dlip jayesh-bhoot ]; - license = licenses.mit; + maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index a87cd0943428..11d9b8a6fe0b 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe ''; - meta = with lib; { + meta = { description = "Analysis binary for the ReScript VSCode plugin"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = with maintainers; [ dlip jayesh-bhoot ]; - license = licenses.mit; + maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a888eb3695f4..77d4d9d83682 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -40,13 +40,13 @@ let version = "1.0.1"; sha256 = "sha256-0SsHf1zZgmrb7oIsRU6Xpa3AvR8bSfANz5ZlRogjiS0="; }; - meta = with lib; { + meta = { changelog = "https://github.com/1Password/op-vscode/releases"; description = "A VSCode extension that integrates your development workflow with 1Password service"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=1Password.op-vscode"; homepage = "https://github.com/1Password/op-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ _2gn ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._2gn ]; }; }; @@ -57,12 +57,12 @@ let version = "0.0.6"; sha256 = "TVBvF/5KQVvWX1uHwZDlmvwGjOO5/lXbgVzB26U8rNQ="; }; - meta = with lib; { + meta = { description = "A Visual Studio Code extension providing rainbow brackets"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=2gua.rainbow-brackets"; homepage = "https://github.com/lcultx/rainbow-brackets"; - license = licenses.mit; - maintainers = with maintainers; [ CompEng0001 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.CompEng0001 ]; }; }; @@ -75,7 +75,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -170,13 +170,13 @@ let version = "13.3.4"; sha256 = "sha256-odFh4Ms60tW+JOEbzzglgKe7BL1ccv3TKGir5NlvIrQ="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; description = "Editor services for Angular templates"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template"; homepage = "https://github.com/angular/vscode-ng-language-service"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -188,8 +188,8 @@ let version = "0.2.2"; sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -200,8 +200,8 @@ let version = "0.3.3"; sha256 = "0pqiwcvn5c8kwqlmz4ribwwra69gbiqvz41ig4fh29hkyh078rfk"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; }; @@ -213,11 +213,11 @@ let version = "1.1.1"; sha256 = "1adcw9jj3npk3l6lnlfgji2l529c4s5xp9jl748r9naiy3w3dpjv"; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/Antyos.openscad/changelog"; description = "OpenSCAD highlighting, snippets, and more for VSCode"; homepage = "https://github.com/Antyos/vscode-openscad"; - license = licenses.gpl3; + license = lib.licenses.gpl3; }; }; @@ -228,13 +228,13 @@ let version = "1.19.11"; sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; description = "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=apollographql.vscode-apollo"; homepage = "https://github.com/apollographql/vscode-graphql"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -245,13 +245,13 @@ let version = "0.19.0"; sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU="; }; - meta = with lib; { + meta = { description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; homepage = "https://github.com/arcticicestudio/nord-visual-studio-code"; - license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -296,8 +296,8 @@ let "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" ''; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -308,13 +308,13 @@ let version = "0.29.1"; sha256 = "sha256-fMeEeYCZuORhZRds0A8HjHPncK0+SQbV0+f/zU5AIg4="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; description = "Astro language support for VSCode"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode"; homepage = "https://github.com/withastro/language-tools"; - license = licenses.mit; - maintainers = with maintainers; [ wackbyte ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; }; }; @@ -337,13 +337,13 @@ let version = "0.0.1"; sha256 = "sha256-ZcZlHoa2aoCeruMWbUUgfFHsPqyWmd2xFY6AKxJysYE="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/attilabuti.brainfuck-syntax/changelog"; description = "VSCode extension providing syntax highlighting support for Brainfuck"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax"; homepage = "https://github.com/attilabuti/brainfuck-syntax"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -359,11 +359,11 @@ let cd "$out/$installPrefix" jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/lang-srv"' package.json | sponge package.json ''; - meta = with lib; { + meta = { description = "Standard ML support for VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; - license = licenses.mit; - maintainers = with maintainers; [ smasher164 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.smasher164 ]; }; }; @@ -399,12 +399,12 @@ let buildInputs = [ nodePackages.pyright ]; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; description = "A performant, feature-rich language server for Python in VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; homepage = "https://github.com/microsoft/pylance-release"; - license = licenses.unfree; + license = lib.licenses.unfree; }; }; @@ -420,8 +420,8 @@ let cd "$out/$installPrefix" jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json ''; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -444,12 +444,12 @@ let version = "2.0.5"; sha256 = "sha256-D04EJButnam/l4aAv1yNbHlTKMb3x1yrS47+9XjpCLI="; }; - meta = with lib; { + meta = { description = "VSCode Extension Formatter for OCaml language"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter"; homepage = "https://github.com/badochov/ocamlformatter-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -460,8 +460,8 @@ let version = "1.0.1"; sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -472,8 +472,8 @@ let version = "0.3.0"; sha256 = "1x80s8l8djchg17553aiwaf4b49hf6awiayk49wyii0i26hlpjk1"; }; - meta = with lib; { - license = licenses.asl20; + meta = { + license = lib.licenses.asl20; }; }; @@ -489,8 +489,8 @@ let cd "$out/$installPrefix" jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json ''; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -501,8 +501,8 @@ let version = "0.2.10"; sha256 = "sha256-RW4vm0Hum9AeN4Rq7MSJOIHnALU0L1tBLKjaRLA2hL8="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -513,8 +513,8 @@ let version = "0.9.0"; sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -525,8 +525,8 @@ let version = "0.3.1"; sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -537,8 +537,8 @@ let version = "0.2.1"; sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -549,8 +549,8 @@ let version = "1.17.4"; sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -571,8 +571,8 @@ let version = "0.8.6"; sha256 = "sha256-v15KuD3eYFCsrworCJ1SZAMkyZKztAwWKmfwmbirleI="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -583,8 +583,8 @@ let version = "0.0.1"; sha256 = "07w35c69vk1l6vipnq3qfack36qcszqxn8j3v332bl0w6m02aa7k"; }; - meta = with lib; { - license = licenses.mpl20; + meta = { + license = lib.licenses.mpl20; }; }; @@ -595,13 +595,13 @@ let version = "0.3.2"; sha256 = "sha256-g+LfgjAnSuSj/nSmlPdB0t29kqTmegZB5B1cYzP8kCI="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/bungcip.better-toml/changelog"; description = "Better TOML Language support"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=bungcip.better-toml"; homepage = "https://github.com/bungcip/better-toml/blob/master/README.md"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -612,11 +612,11 @@ let version = "1.8.2"; sha256 = "OvWdDQfhprQNve017pNSksMuCK3Ccaar5Ko5Oegdiuo="; }; - meta = with lib; { + meta = { description = "PHP code intelligence for Visual Studio Code"; - license = licenses.mit; + license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client"; - maintainers = with maintainers; [ drupol ]; + maintainers = [ lib.maintainers.drupol ]; }; }; @@ -627,11 +627,11 @@ let version = "2.5.0"; sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; - meta = with lib; { + meta = { description = "Soothing pastel theme for VSCode"; - license = licenses.mit; + license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc"; - maintainers = with maintainers; [ nullx76 ]; + maintainers = [ lib.maintainers.nullx76 ]; }; }; @@ -644,12 +644,12 @@ let version = "2.8.1"; sha256 = "sha256-lTKzMphkGgOG2XWqz3TW2G9sISBc/kG7oXqcIH8l+Mg="; }; - meta = with lib; { + meta = { description = "Visual Studio Code plugin that autocompletes filenames"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; homepage = "https://github.com/ChristianKohler/PathIntellisense"; - license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -660,8 +660,8 @@ let version = "0.1.0"; sha256 = "0q089jnzqzhjfnv0vlb5kf747s3mgz64r7q3zscl66zb2pz5q4zd"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -672,19 +672,19 @@ let version = "0.7.0"; sha256 = "0fm4sxx1cb679vn4v85dw8dfp5x0p74m9p2b56gqkvdap0f2q351"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; coenraads.bracket-pair-colorizer = buildVscodeMarketplaceExtension { - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog"; description = "A customizable extension for colorizing matching brackets"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer"; homepage = "https://github.com/CoenraadS/BracketPair"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; mktplcRef = { name = "bracket-pair-colorizer"; @@ -701,8 +701,8 @@ let version = "0.2.2"; sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -713,12 +713,12 @@ let version = "0.0.3"; sha256 = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; }; - meta = with lib; { + meta = { description = "Lightweight syntax highlighting for LLVM IR"; homepage = "https://github.com/colejcummins/llvm-syntax-highlighting"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=colejcummins.llvm-syntax-highlighting"; - maintainers = with lib.maintainers; [ inclyc ]; - license = licenses.mit; + maintainers = [ lib.maintainers.inclyc ]; + license = lib.licenses.mit; }; }; @@ -731,7 +731,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -756,13 +756,13 @@ let version = "2.4.0"; sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; description = "Integrates ESLint JavaScript into VS Code."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; homepage = "https://github.com/Microsoft/vscode-eslint"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -775,7 +775,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -786,13 +786,13 @@ let version = "0.49.0"; sha256 = "sha256-Mh/OoRK410aXEr3sK2CYFDsXGSqFT+JOWi9jHOdK01Y="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; description = "Markdown linting and style checking for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint"; homepage = "https://github.com/DavidAnson/vscode-markdownlint"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -803,12 +803,12 @@ let version = "0.19.0"; sha256 = "sha256-crq6CTXpzwHJL8FPIBneAGjDgUUNdpBt6rIaMCr1F1U="; }; - meta = with lib; { + meta = { description = "LanguageTool integration for VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=davidlday.languagetool-linter"; homepage = "https://github.com/davidlday/vscode-languagetool-linter"; - license = licenses.asl20; - maintainers = with maintainers; [ ebbertd ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.ebbertd ]; }; }; @@ -819,13 +819,13 @@ let version = "3.12.0"; sha256 = "sha256-ZsHCWQtEQKkdZ3uk072ZBfHFRzk4Owf4h7+szHLgIeo="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; description = "A language server client for Deno"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=denoland.vscode-deno"; homepage = "https://github.com/denoland/vscode_deno"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -866,24 +866,24 @@ let version = "5.8.5"; sha256 = "25v2tdAX7fVl2B5nvOIKN9vP1G5rA0G67CiDQn9n9Uc="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; description = "Makes judging, compiling, and downloading problems for competitve programming easy. Also supports auto-submit for a few sites."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=DivyanshuAgrawal.competitive-programming-helper"; homepage = "https://github.com/agrawal-d/cph"; - license = licenses.gpl3; - maintainers = with maintainers; [ arcticlimer ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.arcticlimer ]; }; }; donjayamanne.githistory = buildVscodeMarketplaceExtension { - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; description = "View git log, file history, compare branches or commits"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory"; homepage = "https://github.com/DonJayamanne/gitHistoryVSCode/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; mktplcRef = { name = "githistory"; @@ -914,12 +914,12 @@ let version = "2.24.2"; sha256 = "sha256-YNqWEIvlEI29mfPxOQVdd4db9G2qNodhz8B0MCAAWK8="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/dracula-theme.theme-dracula/changelog"; description = "Dark theme for many editors, shells, and more"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=dracula-theme.theme-dracula"; homepage = "https://draculatheme.com/"; - license = licenses.mit; + license = lib.licenses.mit; }; }; @@ -934,7 +934,7 @@ let version = "13.4.0"; sha256 = "sha256-CYI62sWPlJNRP2KIkg4vQutIMC6gaCxtTVoOWZIS8Lw="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; description = "GitLens supercharges the Git capabilities built into Visual Studio Code."; longDescription = '' @@ -944,8 +944,8 @@ let ''; downloadPage = "https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens"; homepage = "https://gitlens.amod.io/"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -956,13 +956,13 @@ let version = "0.16.4"; sha256 = "0fa4h9hk1xq6j3zfxvf483sbb4bd17fjl5cdm3rll7z9kaigdqwg"; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/EditorConfig.EditorConfig/changelog"; description = "EditorConfig Support for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig"; homepage = "https://github.com/editorconfig/editorconfig-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; }; }; @@ -997,13 +997,13 @@ let version = "2.4.0"; sha256 = "sha256-5hYlkx8hlwS8iWTlfupX8XjTLAY/KUi0bd3jf/tm92o="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; description = "Elm language server"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Elmtooling.elm-ls-vscode"; homepage = "https://github.com/elm-tooling/elm-language-client-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ mcwitt ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.mcwitt ]; }; }; @@ -1014,8 +1014,8 @@ let version = "2.1.79"; sha256 = "1cr1pxgxlfr643sfxbcr2xd53s1dnzcpacjj0ffkgizfda2psy78"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1026,13 +1026,13 @@ let version = "9.10.4"; sha256 = "sha256-khtyB0Qbm+iuM1GsAaF32YRv1VBTIy7daeCKdgwCIC8="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; description = "Code formatter using prettier"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -1058,12 +1058,12 @@ let jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json ''; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; description = "The best coding experience for Racket in VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; homepage = "https://github.com/Eugleo/magic-racket"; - license = licenses.agpl3Only; + license = lib.licenses.agpl3Only; }; }; @@ -1074,24 +1074,24 @@ let version = "0.0.3"; sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; description = "Language support for Lex, Flex, Yacc and Bison."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; - license = licenses.mit; - maintainers = with maintainers; [ emilytrau ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.emilytrau ]; }; }; file-icons.file-icons = buildVscodeMarketplaceExtension { - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; description = "File-specific icons in VSCode for improved visual grepping."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=file-icons.file-icons"; homepage = "https://github.com/file-icons/vscode"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; mktplcRef = { name = "file-icons"; @@ -1108,13 +1108,13 @@ let version = "2.9.8"; sha256 = "sha256-MCL562FPgEfhUM1KH5LMl7BblbjIkQ4UEwB67RlO5Mk="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; description = "A Visual Studio Code extension for debugging web applications and browser extensions in Firefox"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=firefox-devtools.vscode-firefox-debug"; homepage = "https://github.com/firefox-devtools/vscode-firefox-debug"; - license = licenses.mit; - maintainers = with maintainers; [ felschr ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.felschr ]; }; }; @@ -1125,13 +1125,13 @@ let version = "0.18.3"; sha256 = "sha256-qbF4k3GP7UdQrw0x/egVRkv5TYDwYWoycxY/HJSFTkI="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; description = "A personal knowledge management and sharing system for VSCode "; downloadPage = "https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode"; homepage = "https://foambubble.github.io/"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -1186,22 +1186,22 @@ let jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json ''; - meta = with lib; { + meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; homepage = "https://github.com/foxundermoon/vs-shell-format"; - license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; }; }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog"; description = "Reason support for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=freebroccolo.reasonml"; homepage = "https://github.com/reasonml-editor/vscode-reasonml"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + maintainers = [ ]; }; mktplcRef = { name = "reasonml"; @@ -1218,12 +1218,12 @@ let version = "1.7.8"; sha256 = "18qws35qvnl0ahk5sxh4mzkw0ib788y1l97ijmpjszs0cd4bfsa6"; }; - meta = with lib; { + meta = { description = "VSCode extension for SCSS"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion"; homepage = "https://github.com/gencer/SCSS-Everywhere"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -1234,12 +1234,12 @@ let version = "3.44.2"; sha256 = "sha256-S2PI+r4LrHA7tW2EMfcAkP5jUnd0mCEV72oTXMa9Xkc="; }; - meta = with lib; { + meta = { description = "GitLab extension for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -1250,12 +1250,12 @@ let version = "4.2.55"; sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; }; - meta = with lib; { + meta = { description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; homepage = "https://github.com/jjuback/gc-excelviewer"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -1266,8 +1266,8 @@ let version = "0.24.6"; sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1278,13 +1278,13 @@ let version = "0.0.15"; sha256 = "rKAy84Uiat5VOQXd4OXToNfxAJ6SuWPT47vuiyK4qwg="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; description = "VS Code extension which allows you to easily exclude modified or new files so they don't get committed accidentally"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jellyedwards.gitsweep"; homepage = "https://github.com/jellyedwards/gitsweep"; - license = licenses.mit; - maintainers = with maintainers; [ MatthieuBarthel ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MatthieuBarthel ]; }; }; @@ -1297,7 +1297,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -1331,12 +1331,12 @@ let version = "1.70.8099"; sha256 = "sha256-+jlLM9UC1DZFBrtiiri4jvpuc/Rf9PcSVP8D8pmQC2s="; }; - meta = with lib; { + meta = { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; homepage = "https://github.com/features/copilot"; - license = licenses.unfree; - maintainers = with maintainers; [ Zimmi48 ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.Zimmi48 ]; }; }; @@ -1347,13 +1347,13 @@ let version = "4.1.1"; sha256 = "14wz2b0bn1rnmpj28c0mivz2gacla2dgg8ncv7qfx9bsxhf95g68"; }; - meta = with lib; { + meta = { description = "GitHub theme for VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; homepage = "https://github.com/primer/github-vscode-theme"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.hugolgst ]; }; }; @@ -1399,8 +1399,8 @@ let version = "0.0.224"; sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1411,8 +1411,8 @@ let version = "2.2.1"; sha256 = "14p9g07zsb3da4ilaasgsdvh3wagfzayqr8ichsf6k5c952zi8fk"; }; - meta = with lib; { - license = licenses.mit; + meta ={ + license = lib.licenses.mit; }; }; @@ -1425,8 +1425,8 @@ let version = "1.5.0"; sha256 = "1c0kfavdwgwham92xrh0gnyxkrl9qlkpv39l1yhrldn8vd10fj5i"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1437,8 +1437,8 @@ let version = "0.1.2"; sha256 = "0i9kpnlk3naycc7k8gmcxas3s06d67wxr3nnyv5hxmsnsx5sfvb7"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1449,13 +1449,13 @@ let version = "1.6.0"; sha256 = "1pbk8kflywll6lqhmffz9yjf01dn8xq8sk6rglnfn2kl2ildfhh6"; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/iciclesoft.workspacesort/changelog"; description = "Sort workspace-folders alphabetically rather than in chronological order"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=iciclesoft.workspacesort"; homepage = "https://github.com/iciclesoft/workspacesort-for-VSCode"; - license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; }; }; @@ -1466,13 +1466,13 @@ let version = "7.5.1"; sha256 = "sha256-AiDYqYF+F69O/aeolIEzqLmg20YN/I4EV6XMa8UgMns="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; description = "Enhanced F# Language Features for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Ionide.Ionide-fsharp"; homepage = "https://ionide.io"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -1483,13 +1483,13 @@ let version = "0.13.0"; sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; homepage = "https://github.com/elixir-lsp/elixir-ls"; - license = licenses.mit; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -1500,8 +1500,8 @@ let version = "0.6.13"; sha256 = "0myl7rppzcz7hxy9zjs81vs9p66lnbfcrdr6s5qb4i6929gmywfy"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1512,12 +1512,12 @@ let version = "0.1.0"; sha256 = "sha256-URq90lOFtPCNfSIl2NUwihwRQyqgDysGmBc3NG7o7vk="; }; - meta = with lib; { + meta = { description = "Adds formatting and syntax highlighting support for env files (.env) to Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env"; homepage = "https://github.com/IronGeek/vscode-env.git"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -1528,12 +1528,13 @@ let version = "9.7.0"; sha256 = "sha256-Y1KoCOoOJ8CZ3IReDoyzF404CBy1BAWaZSr48EP7bz4="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; description = "LaTeX Workshop Extension"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop"; homepage = "https://github.com/James-Yu/LaTeX-Workshop"; - license = licenses.mit; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -1544,12 +1545,12 @@ let version = "1.8.0"; sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; - meta = with lib; { + meta = { description = "Gruvbox Theme"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jdinhlife.gruvbox"; homepage = "https://github.com/jdinhify/vscode-theme-gruvbox"; - license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -1562,13 +1563,13 @@ let version = "0.2.1"; sha256 = "sha256-yC4ybThMFA2ncGhp8BYD7IrwYiDU3226hewsRvJYKy4="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; description = "Nix language support with formatting and error report"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; - license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.SuperSandro2000 ]; }; }; @@ -1579,8 +1580,8 @@ let version = "1.5.0"; sha256 = "sha256-anIZxqO4pK77FmhUamRnJVN2q8FifH6ffqRE2eFwyWM="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1591,8 +1592,8 @@ let version = "4.2.2"; sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -1639,13 +1640,13 @@ let version = "0.1.3"; sha256 = "sha256-CecEv19nEtnMe0KlCMNBM9ZAjbAVgPNUcZ6cBxHw44M="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/kalebpace.balena-vscode/changelog"; description = "VS Code extension for integration with Balena"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=kalebpace.balena-vscode"; homepage = "https://github.com/balena-vscode/balena-vscode"; - license = licenses.mit; - maintainers = with maintainers; [ kalebpace ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kalebpace ]; }; }; @@ -1669,11 +1670,11 @@ let < package.json \ | sponge package.json ''; - meta = with lib; { + meta = { description = "The Uncompromising Nix Code Formatter"; homepage = "https://github.com/kamadorueda/alejandra"; - license = licenses.unlicense; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -1696,11 +1697,11 @@ let jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json ''; - meta = with lib; { + meta = { description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; license = lib.licenses.asl20; - maintainers = with maintainers; [ wolfangaukang ]; + maintainers = [ lib.maintainers.wolfangaukang ]; }; }; @@ -1752,7 +1753,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=lucperkins.vrl-vscode"; homepage = "https://github.com/lucperkins/vrl-vscode"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ lucperkins ]; + maintainers = [ lib.maintainers.lucperkins ]; }; }; @@ -1765,7 +1766,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -1792,7 +1793,7 @@ let homepage = "https://github.com/caddyserver/vscode-caddyfile"; changelog = "https://marketplace.visualstudio.com/items/matthewpi.caddyfile-support/changelog"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matthewpi ]; + maintainers = [ lib.maintainers.matthewpi ]; }; }; @@ -1803,13 +1804,13 @@ let version = "0.1.12"; sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; }; - meta = with lib; { + meta = { description = "Lisp syntax for vscode"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp"; homepage = "https://github.com/mattn/vscode-lisp"; changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -1820,12 +1821,12 @@ let version = "0.3.7"; sha256 = "sha256-QT+fb23g+IXlNKNAbjADEpqrS6ll2W8Yd0YzwJAjhQQ="; }; - meta = with lib; { + meta = { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=maximedenes.vscoq"; homepage = "https://github.com/coq-community/vscoq"; - license = licenses.mit; - maintainers = with maintainers; [ Zimmi48 ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Zimmi48 ]; }; }; @@ -1884,11 +1885,11 @@ let version = "0.10.1"; sha256 = "0m89sx1qqdkwa9pfmd9b11lp8z0dqpi6jn27js5q4ymscyg41bqd"; }; - meta = with lib; { + meta = { description = "direnv support for Visual Studio Code"; - license = licenses.bsd0; + license = lib.licenses.bsd0; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; - maintainers = with maintainers; [ nullx76 ]; + maintainers = [ lib.maintainers.nullx76 ]; }; }; @@ -1987,12 +1988,12 @@ let version = "2023.1.0"; sha256 = "sha256-OiVb88BGvzsPTzKU1rGLGSMQSwKV4zI9FthOmutz34U="; }; - meta = with lib; { + meta = { description = "A Visual Studio Code extension for PowerShell language support"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell"; homepage = "https://github.com/PowerShell/vscode-powershell"; - license = licenses.mit; - maintainers = with maintainers; [ rhoriguchi ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.rhoriguchi ]; }; }; @@ -2005,12 +2006,12 @@ let version = "0.1.4"; sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; }; - meta = with lib; { + meta = { description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit"; homepage = "https://github.com/microsoft/vscode-themes"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -2021,13 +2022,13 @@ let version = "1.1.282"; sha256 = "14qkk9gbpwnbkk3dk7b7s92smj374ha7axlsi74fllw74lp4ziwn"; }; - meta = with lib; { + meta = { description = "VS Code static type checking for Python"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; homepage = "https://github.com/Microsoft/pyright#readme"; changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -2126,13 +2127,13 @@ let version = "2.6.0"; sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; description = "Highlight web colors in your editor"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=naumovs.color-highlight"; homepage = "https://github.com/enyancc/vscode-ext-color-highlight"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -2143,13 +2144,13 @@ let version = "0.6.1"; sha256 = "sha256-NI0cbjsZPW8n6qRTRKoqznSDhLZRUguP7Sa/d0feeoc="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/njpwerner.autodocstring/changelog"; description = "Generates python docstrings automatically"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=njpwerner.autodocstring"; homepage = "https://github.com/NilsJPWerner/autoDocstring"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -2172,12 +2173,12 @@ let version = "8.2.2"; sha256 = "sha256-7kkJc+hhYaSKUbK4eYwOnLvae80sIg7rd0E4YyCXtPc="; }; - meta = with lib; { + meta = { description = "Makes indentation easier to read"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=oderwat.indent-rainbow"; homepage = "https://github.com/oderwat/vscode-indent-rainbow"; - license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -2188,12 +2189,12 @@ let version = "0.1.1"; sha256 = "sha256-AfCwU4FF8a8C9D6+lyUDbAOLlD5SpZZw8CZVGpzRoV0="; }; - meta = with lib; { + meta = { description = "Syntax highlighting support for HEEx / Phoenix templates"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix"; homepage = "https://github.com/phoenixframework/vscode-phoenix"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -2252,8 +2253,8 @@ let version = "0.0.8"; sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -2261,13 +2262,13 @@ let matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; description = "Official OCaml Support from OCamlLabs"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; - license = licenses.isc; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; @@ -2308,12 +2309,12 @@ let version = "1.1.0"; sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; - meta = with lib; { + meta = { description = "Theme for the GNOME desktop"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=piousdeer.adwaita-theme"; homepage = "https://github.com/piousdeer/vscode-adwaita"; - license = licenses.gpl3; - maintainers = with maintainers; [ wyndon ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.wyndon ]; }; }; @@ -2324,13 +2325,13 @@ let version = "4.2.0"; sha256 = "sha256-1U3JlWfIlTt0AMPsiP3vD2ZEzD2oUsYsqRRwBQeoLIA="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; description = "VSCode extension for syntax highlighting, formatting, auto-completion, jump-to-definition and linting for .prisma files"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma"; homepage = "https://github.com/prisma/language-tools"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; + license = lib.licenses.asl20; + maintainers = [ ]; }; }; @@ -2352,8 +2353,8 @@ let version = "0.6.0"; sha256 = "0wkpq9f48hplrgabb0v1ij6fc4sb8h4a93dagw4biprhnnm3qx49"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -2364,8 +2365,8 @@ let version = "5.6.1"; sha256 = "sha256-QPMZMttYV+dQfWTniA7nko7kXukqU9g6Wj5YDYfL6hw="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -2421,7 +2422,7 @@ let ''; homepage = "https://github.com/sana-ajani/taskrunner-code"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pbsds ]; + maintainers = [ lib.maintainers.pbsds ]; }; }; @@ -2470,7 +2471,7 @@ let }; meta = { license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kamadorueda ]; + maintainers = [ lib.maintainers.kamadorueda ]; }; }; @@ -2490,7 +2491,7 @@ let ''; homepage = "https://github.com/shd101wyy/vscode-markdown-preview-enhanced"; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ pbsds ]; + maintainers = [ lib.maintainers.pbsds ]; }; }; @@ -2525,13 +2526,13 @@ let version = "2.0.0"; sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; }; - meta = with lib; { + meta = { changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; description = "Provides syntax and recipe launcher for Just scripts"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just"; homepage = "https://github.com/skellock/vscode-just"; - license = licenses.mit; - maintainers = with maintainers; [ maximsmol ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.maximsmol ]; }; }; @@ -2576,8 +2577,8 @@ let version = "0.9.3"; sha256 = "1kvsj085w1xax6fg0kvsj1cizqh86i0pkzpwi0sbfvmcq21i6ghn"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -2588,12 +2589,12 @@ let version = "0.0.8"; sha256 = "0j8pmrs1lk138vhqx594pzxvrma4yl3jh7ihqm2kgh0cwnkbj36m"; }; - meta = with lib; { + meta = { description = "VSCode extension for Elixir EEx and HTML (EEx) code snippets"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets"; homepage = "https://github.com/stefanjarina/vscode-eex-snippets"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -2604,13 +2605,13 @@ let version = "0.0.6"; sha256 = "0mph2nval1ddmv9hpl51fdvmagzkqsn8ljwqsfha2130bb7la0d9"; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; description = "A simple extension for tmux behavior in vscode terminal."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=stephlin.vscode-tmux-keybinding"; homepage = "https://github.com/StephLin/vscode-tmux-keybinding"; - license = licenses.mit; - maintainers = with maintainers; [ dbirks ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; }; }; @@ -2621,13 +2622,13 @@ let version = "1.16.3"; sha256 = "sha256-WHeLTN992ltEZw2W7B3sJrHfAFsOGMq3llV4C0hXLNA="; }; - meta = with lib; { + meta = { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; description = "Hard word wrapping for comments and other text at a given column."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=stkb.rewrap"; homepage = "https://github.com/stkb/Rewrap#readme"; - license = licenses.asl20; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -2638,13 +2639,13 @@ let version = "2.19.0"; sha256 = "sha256-c95u++tkK8hToauulY8faNITUmsCBEeC2B8mHY0oEmA="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; description = "Spelling checker for source code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker"; homepage = "https://streetsidesoftware.github.io/vscode-spell-checker"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ datafoo ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.datafoo ]; }; }; @@ -2663,7 +2664,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode"; homepage = "https://github.com/sveltejs/language-tools#readme"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fabianhauser ]; + maintainers = [ lib.maintainers.fabianhauser ]; }; }; @@ -2674,13 +2675,13 @@ let version = "0.3.18"; sha256 = "sha256-ypYqVH1ViJE7+mAJnxmpvUSmiImOo7rE7m+ijTEpmwg="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; description = "Markdown knowledge base with bidirectional [[link]]s built on top of VSCode"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=svsool.markdown-memo"; homepage = "https://github.com/svsool/vscode-memo"; - license = licenses.mit; - maintainers = with maintainers; [ ratsclub ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; }; }; @@ -2727,12 +2728,12 @@ let version = "0.1.6"; sha256 = "096wwmwpas21f03pbbz40rvc792xzpl5qqddzbry41glxpzywy6b"; }; - meta = with lib; { + meta = { description = "VSCode extension for high-quality Pascal highlighting"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal"; homepage = "https://github.com/ALANVF/vscode-pascal-magic"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = [ ]; }; }; @@ -2848,13 +2849,13 @@ let version = "3.6.0"; sha256 = "sha256-oNzB81mPZjEwrqbeFMvTlXERXrYBpF03EH9ZXz/daOs="; }; - meta = with lib; { + meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; description = "Improve highlighting of errors, warnings and other language diagnostics."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens"; homepage = "https://github.com/usernamehw/vscode-error-lens"; - license = licenses.mit; - maintainers = with maintainers; [ imgabe ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.imgabe ]; }; }; @@ -2882,9 +2883,9 @@ let jq '.contributes.configuration.properties."ltex.java.path".default = "${jdk}"' package.json | sponge package.json ''; - meta = with lib; { - license = licenses.mpl20; - maintainers = [ maintainers._0xbe7a ]; + meta = { + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers._0xbe7a ]; }; }; @@ -2895,9 +2896,9 @@ let version = "1.3.0"; sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; }; - meta = with lib; { - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wolfangaukang ]; }; }; @@ -2983,12 +2984,12 @@ let version = "12.2.0"; sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; }; - meta = with lib; { + meta = { description = "Bring real icons to your Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons"; homepage = "https://github.com/vscode-icons/vscode-icons"; - license = licenses.mit; - maintainers = with maintainers; [ ggwpaiushtha ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ggwpaiushtha ]; }; }; @@ -3035,8 +3036,8 @@ let version = "3.3.0"; sha256 = "0wl8vl8n0avd6nbfmis0lnlqlyh4yp3cca6kvjzgw5xxdc5bl38r"; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -3047,8 +3048,8 @@ let version = "2.1.2"; sha256 = "sha256-n91Rj1Rpp7j7gndkt0bV+jT1nRMv7+coVoSL5c7Ii3A="; }; - meta = with lib; { - license = licenses.mit; + meta = { + license = lib.licenses.mit; }; }; @@ -3059,9 +3060,9 @@ let version = "1.9.0"; sha256 = "abd0ef9176eff864f278c548c944032b8f4d8ec97d9ac6e7383d60c92e258c2f"; }; - meta = with lib; { - license = licenses.mit; - maintainers = [ maintainers.zeratax ]; + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.zeratax ]; }; }; @@ -3151,12 +3152,12 @@ let version = "0.0.8"; sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; }; - meta = with lib; { + meta = { description = "Basic RISC-V colorization and snippets support."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=zhwu95.riscv"; homepage = "https://github.com/zhuanhao-wu/vscode-riscv-support"; - license = licenses.mit; - maintainers = [ maintainers.CardboardTurkey ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.CardboardTurkey ]; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index e6e094bb1cb6..234b0880e284 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -13,8 +13,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls ''; - meta = with lib; { - license = licenses.mit; - maintainers = with maintainers; [ rhoriguchi ]; + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.rhoriguchi ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index c54e975e4f46..fd1367b23968 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -13,15 +13,15 @@ vscode-utils.buildVscodeMarketplaceExtension { jq '.contributes.configuration.properties."plantuml.java".default = "${plantuml}/bin/plantuml"' package.json | sponge package.json ''; - meta = with lib; { + meta = { description = "A Visual Studio Code extension for supporting Rich PlantUML"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; homepage = "https://github.com/qjebbs/vscode-plantuml"; changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ victormignot ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.victormignot ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 909dc69c02ed..5289a3cb41cc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -121,11 +121,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec { '') vsixInfo.binaries)); - meta = with lib; { + meta = { description = "C# for Visual Studio Code (powered by OmniSharp)"; homepage = "https://github.com/OmniSharp/omnisharp-vscode"; - license = licenses.mit; - maintainers = [ maintainers.jraygauthier ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jraygauthier ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 0a62a5b02daa..559eef612cd0 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -76,13 +76,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { fi ''; - meta = with lib; { + meta = { description = "A Visual Studio Code extension with rich support for the Python language"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.python"; homepage = "https://github.com/Microsoft/vscode-python"; changelog = "https://github.com/microsoft/vscode-python/releases"; - license = licenses.mit; + license = lib.licenses.mit; platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = with maintainers; [ jraygauthier jfchevrette ]; + maintainers = [ lib.maintainers.jraygauthier lib.maintainers.jfchevrette ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 7089f9e3d39d..ef1a5a4d49ec 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -30,10 +30,10 @@ vscode-utils.buildVscodeMarketplaceExtension { jq "$(print_jq_query)" ./package.json | sponge ./package.json ''; - meta = with lib; { + meta = { description = "Jupyter extension for vscode"; homepage = "https://github.com/microsoft/vscode-jupyter"; - license = licenses.mit; - maintainers = with maintainers; [ jraygauthier ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jraygauthier ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index ee2f8dbec9a6..de191e97e0dc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -87,9 +87,9 @@ buildVscodeMarketplaceExtension { --replace '# Start the server\n' '${patch}' ''; - meta = with lib; { + meta = { description = "Use any remote machine with a SSH server as your development environment."; - license = licenses.unfree; - maintainers = with maintainers; [ SuperSandro2000 tbenst ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.SuperSandro2000 lib.maintainers.tbenst ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 65f833a3fb74..c51a86f888e4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -80,11 +80,11 @@ vscode-utils.buildVscodeMarketplaceExtension rec { wrapProgram $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters/bin/OpenDebugAD7 --prefix PATH : ${lib.makeBinPath [ gdb ]} ''; - meta = with lib; { + meta = { description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; - license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier stargate01 ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.jraygauthier lib.maintainers.stargate01 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index 3c20aa299b6e..209ee1d95a9a 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -44,11 +44,11 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens --replace "'xsel'" "'${xsel}/bin/xsel'" ''; - meta = with lib; { + meta = { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; - license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier V ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.jraygauthier lib.maintainers.V ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 368d6ff8e08c..d0d1b990f449 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -80,11 +80,11 @@ vscode-utils.buildVscodeExtension { package.json | sponge package.json ''; - meta = with lib; { + meta = { description = "An alternative rust language server to the RLS"; homepage = "https://github.com/rust-lang/rust-analyzer"; - license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ ]; - platforms = platforms.all; + license = [ lib.licenses.mit lib.licenses.asl20 ]; + maintainers = [ ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index 6c9c72ca6094..16f4c52034dd 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -18,10 +18,10 @@ vscode-utils.buildVscodeMarketplaceExtension { $out/$installPrefix/server/bin/lua-language-server ''; - meta = with lib; { + meta = { description = "The Lua language server provides various language features for Lua to make development easier and faster."; homepage = "https://marketplace.visualstudio.com/items?itemName=sumneko.lua"; - license = licenses.mit; - maintainers = with maintainers; [ lblasc ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lblasc ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index c704e6f47300..f88173d9b4ea 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -103,11 +103,11 @@ in stdenv.mkDerivation { updateScript = ./update.sh; }; - meta = with lib; { + meta = { description = "A native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ nigelgbanks ]; - platforms = platforms.all; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.nigelgbanks ]; + platforms = lib.platforms.all; }; } From c60afb9cbe3390e7b57f1dd553774e79864cea4d Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Sat, 18 Mar 2023 00:53:44 -0700 Subject: [PATCH 30/36] sapling: fix build Nixpkgs commit 451c6321 upgraded setuptools from version 65.0.3 to version 67.4.0. This upgrade introduced a breaking change in setuptools [1] which causes the Sapling package's build to fail: setuptools.extern.packaging.version.InvalidVersion: Invalid version: '0.2.20230124-180750-hf8cd450a' This is an upstream issue [2]. For now, work around this issue in Nixpkgs by truncating Sapling's version number. Before 451c6321: $ nix-env -q sapling sapling-0.2.20230228-144002-h9440b05e $ sl --version Sapling 0.2.20230228-144002-h9440b05e After this patch: $ nix-env -q sapling sapling-0.2.20230228-144002-h9440b05e $ sl --version Sapling 0.2.20230228 Refs: 451c63214766d3bb8d078620cff4dc74463c5bc8 [1] https://github.com/pypa/setuptools/blob/be6c0218bcba78dbd4ea0b5a8bb9acd5d5306240/CHANGES.rst#v6600 [2] https://github.com/facebook/sapling/issues/571 --- .../version-management/sapling/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 4028c41232ff..222d77ca7163 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -166,15 +166,20 @@ python3Packages.buildPythonApplication { HGNAME = "sl"; SAPLING_OSS_BUILD = "true"; - SAPLING_VERSION = version; SAPLING_VERSION_HASH = versionHash; + # Python setuptools version 66 and newer does not support upstream Sapling's + # version numbers (e.g. "0.2.20230124-180750-hf8cd450a"). Change the version + # number to something supported by setuptools (e.g. "0.2.20230124"). + # https://github.com/facebook/sapling/issues/571 + SAPLING_VERSION = builtins.elemAt (builtins.split "-" version) 0; + # just a simple check phase, until we have a running test suite. this should # help catch issues like lack of a LOCALE_ARCHIVE setting (see GH PR #202760) doCheck = true; installCheckPhase = '' - echo -n "testing sapling version; should be \"${version}\"... " - $out/bin/sl version | grep -qw "${version}" + echo -n "testing sapling version; should be \"$SAPLING_VERSION\"... " + $out/bin/sl version | grep -qw "$SAPLING_VERSION" echo "OK!" ''; From f379fc011c1682646f88e6030adb91f5c519c486 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 18 Mar 2023 17:52:44 -0300 Subject: [PATCH 31/36] vscode-extensions: re-establish alphabetical order --- .../editors/vscode/extensions/default.nix | 867 +++++++++--------- 1 file changed, 434 insertions(+), 433 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 77d4d9d83682..cb2c36d59e2c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -91,18 +91,6 @@ let }; }; - alanz.vscode-hie-server = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-hie-server"; - publisher = "alanz"; - version = "0.0.27"; # see the note above - sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - adpyke.codesnap = buildVscodeMarketplaceExtension { mktplcRef = { name = "codesnap"; @@ -115,6 +103,18 @@ let }; }; + alanz.vscode-hie-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-hie-server"; + publisher = "alanz"; + version = "0.0.27"; # see the note above + sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + alefragnani.bookmarks = buildVscodeMarketplaceExtension { mktplcRef = { name = "bookmarks"; @@ -367,47 +367,6 @@ let }; }; - dart-code.flutter = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "flutter"; - publisher = "dart-code"; - version = "3.50.0"; - sha256 = "sha256-2Mi0BWXfO73BBIZIRJMaQyml+jXBI9d7By+vx9Rg+pE="; - }; - - meta.license = lib.licenses.mit; - }; - - dart-code.dart-code = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "dart-code"; - publisher = "dart-code"; - version = "3.50.0"; - sha256 = "sha256-vdECvW4BfuT3H6GD2cH7lVW0f5591pKjXsWyJzzpHYA="; - }; - - meta.license = lib.licenses.mit; - }; - - ms-python.vscode-pylance = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-pylance"; - publisher = "MS-python"; - version = "2022.7.11"; - sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; - }; - - buildInputs = [ nodePackages.pyright ]; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; - description = "A performant, feature-rich language server for Python in VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; - homepage = "https://github.com/microsoft/pylance-release"; - license = lib.licenses.unfree; - }; - }; - b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixpkgs-fmt"; @@ -564,6 +523,21 @@ let meta.license = lib.licenses.mit; }; + bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-intelephense-client"; + publisher = "bmewburn"; + version = "1.8.2"; + sha256 = "OvWdDQfhprQNve017pNSksMuCK3Ccaar5Ko5Oegdiuo="; + }; + meta = { + description = "PHP code intelligence for Visual Studio Code"; + license = lib.licenses.mit; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client"; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -605,21 +579,6 @@ let }; }; - bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-intelephense-client"; - publisher = "bmewburn"; - version = "1.8.2"; - sha256 = "OvWdDQfhprQNve017pNSksMuCK3Ccaar5Ko5Oegdiuo="; - }; - meta = { - description = "PHP code intelligence for Visual Studio Code"; - license = lib.licenses.mit; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client"; - maintainers = [ lib.maintainers.drupol ]; - }; - }; - catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension { mktplcRef = { name = "catppuccin-vsc"; @@ -749,23 +708,6 @@ let }; }; - dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-eslint"; - publisher = "dbaeumer"; - version = "2.4.0"; - sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; - description = "Integrates ESLint JavaScript into VS Code."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; - homepage = "https://github.com/Microsoft/vscode-eslint"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; - daohong-emilio.yash = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "daohong-emilio"; @@ -779,6 +721,28 @@ let }; }; + dart-code.dart-code = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dart-code"; + publisher = "dart-code"; + version = "3.50.0"; + sha256 = "sha256-vdECvW4BfuT3H6GD2cH7lVW0f5591pKjXsWyJzzpHYA="; + }; + + meta.license = lib.licenses.mit; + }; + + dart-code.flutter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flutter"; + publisher = "dart-code"; + version = "3.50.0"; + sha256 = "sha256-2Mi0BWXfO73BBIZIRJMaQyml+jXBI9d7By+vx9Rg+pE="; + }; + + meta.license = lib.licenses.mit; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; @@ -812,6 +776,23 @@ let }; }; + dbaeumer.vscode-eslint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-eslint"; + publisher = "dbaeumer"; + version = "2.4.0"; + sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; + }; + denoland.vscode-deno = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-deno"; @@ -990,6 +971,23 @@ let }; }; + elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "elixir-ls"; + publisher = "JakeBecker"; + version = "0.13.0"; + sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; + description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; + homepage = "https://github.com/elixir-lsp/elixir-ls"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.datafoo ]; + }; + }; + elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "elm-ls-vscode"; @@ -1227,92 +1225,6 @@ let }; }; - gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "gitlab-workflow"; - publisher = "gitlab"; - version = "3.44.2"; - sha256 = "sha256-S2PI+r4LrHA7tW2EMfcAkP5jUnd0mCEV72oTXMa9Xkc="; - }; - meta = { - description = "GitLab extension for Visual Studio Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; - homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; - license = lib.licenses.mit; - maintainers = [ ]; - }; - }; - - grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "gc-excelviewer"; - publisher = "grapecity"; - version = "4.2.55"; - sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; - }; - meta = { - description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; - homepage = "https://github.com/jjuback/gc-excelviewer"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.kamadorueda ]; - }; - }; - - humao.rest-client = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "humao"; - name = "rest-client"; - version = "0.24.6"; - sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - jellyedwards.gitsweep = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "jellyedwards"; - name = "gitsweep"; - version = "0.0.15"; - sha256 = "rKAy84Uiat5VOQXd4OXToNfxAJ6SuWPT47vuiyK4qwg="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; - description = "VS Code extension which allows you to easily exclude modified or new files so they don't get committed accidentally"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=jellyedwards.gitsweep"; - homepage = "https://github.com/jellyedwards/gitsweep"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.MatthieuBarthel ]; - }; - }; - - jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "jkillian"; - name = "custom-local-formatters"; - version = "0.0.4"; - sha256 = "1pmqnc759fq86g2z3scx5xqpni9khcqi5z2kpl1kb7yygsv314gm"; - }; - meta = { - license = lib.licenses.mit; - maintainers = [ lib.maintainers.kamadorueda ]; - }; - }; - - kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-colorize"; - publisher = "kamikillerto"; - version = "0.11.1"; - sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm"; - }; - meta = { - license = lib.licenses.asl20; - }; - }; - github = { codespaces = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1368,6 +1280,22 @@ let }; }; + gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitlab-workflow"; + publisher = "gitlab"; + version = "3.44.2"; + sha256 = "sha256-S2PI+r4LrHA7tW2EMfcAkP5jUnd0mCEV72oTXMa9Xkc="; + }; + meta = { + description = "GitLab extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; + homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; + license = lib.licenses.mit; + maintainers = [ ]; + }; + }; + golang.go = buildVscodeMarketplaceExtension { mktplcRef = { name = "Go"; @@ -1380,6 +1308,22 @@ let }; }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gc-excelviewer"; + publisher = "grapecity"; + version = "4.2.55"; + sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; + }; + meta = { + description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; + homepage = "https://github.com/jjuback/gc-excelviewer"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; + }; + }; + graphql.vscode-graphql = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-graphql"; @@ -1404,6 +1348,8 @@ let }; }; + hashicorp.terraform = callPackage ./hashicorp.terraform { }; + haskell.haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "haskell"; @@ -1416,8 +1362,6 @@ let }; }; - hashicorp.terraform = callPackage ./hashicorp.terraform { }; - hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { name = "beautify"; @@ -1430,6 +1374,18 @@ let }; }; + humao.rest-client = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "humao"; + name = "rest-client"; + version = "0.24.6"; + sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ibm.output-colorizer = buildVscodeMarketplaceExtension { mktplcRef = { name = "output-colorizer"; @@ -1459,6 +1415,18 @@ let }; }; + influxdata.flux = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "influxdata"; + name = "flux"; + version = "0.6.13"; + sha256 = "0myl7rppzcz7hxy9zjs81vs9p66lnbfcrdr6s5qb4i6929gmywfy"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ionide.ionide-fsharp = buildVscodeMarketplaceExtension { mktplcRef = { name = "Ionide-fsharp"; @@ -1476,35 +1444,6 @@ let }; }; - elixir-lsp.vscode-elixir-ls = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "elixir-ls"; - publisher = "JakeBecker"; - version = "0.13.0"; - sha256 = "sha256-1uaLFTMvkcYrYAt9qDdISJneKxHo9qsris70iowGW2s="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; - description = "Elixir support with debugger, autocomplete, and more. Powered by ElixirLS."; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeBecker.elixir-ls"; - homepage = "https://github.com/elixir-lsp/elixir-ls"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; - }; - }; - - influxdata.flux = buildVscodeMarketplaceExtension { - mktplcRef = { - publisher = "influxdata"; - name = "flux"; - version = "0.6.13"; - sha256 = "0myl7rppzcz7hxy9zjs81vs9p66lnbfcrdr6s5qb4i6929gmywfy"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - irongeek.vscode-env = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-env"; @@ -1556,6 +1495,36 @@ let jebbs.plantuml = callPackage ./jebbs.plantuml {}; + jellyedwards.gitsweep = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jellyedwards"; + name = "gitsweep"; + version = "0.0.15"; + sha256 = "rKAy84Uiat5VOQXd4OXToNfxAJ6SuWPT47vuiyK4qwg="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; + description = "VS Code extension which allows you to easily exclude modified or new files so they don't get committed accidentally"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jellyedwards.gitsweep"; + homepage = "https://github.com/jellyedwards/gitsweep"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.MatthieuBarthel ]; + }; + }; + + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "jkillian"; + name = "custom-local-formatters"; + version = "0.0.4"; + sha256 = "1pmqnc759fq86g2z3scx5xqpni9khcqi5z2kpl1kb7yygsv314gm"; + }; + meta = { + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kamadorueda ]; + }; + }; + jnoortheen.nix-ide = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-ide"; @@ -1678,6 +1647,18 @@ let }; }; + kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-colorize"; + publisher = "kamikillerto"; + version = "0.11.1"; + sha256 = "1h82b1jz86k2qznprng5066afinkrd7j3738a56idqr3vvvqnbsm"; + }; + meta = { + license = lib.licenses.asl20; + }; + }; + kddejong.vscode-cfn-lint = let inherit (python3Packages) cfn-lint; in buildVscodeMarketplaceExtension { @@ -1717,6 +1698,8 @@ let }; }; + llvm-org.lldb-vscode = llvmPackages_8.lldb; + llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-clangd"; @@ -1770,6 +1753,18 @@ let }; }; + marp-team.marp-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "marp-vscode"; + publisher = "marp-team"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + matangover.mypy = buildVscodeMarketplaceExtension { mktplcRef = { name = "mypy"; @@ -1780,6 +1775,8 @@ let meta.license = lib.licenses.mit; }; + matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher + matthewpi.caddyfile-support = buildVscodeMarketplaceExtension { mktplcRef = { name = "caddyfile-support"; @@ -1830,24 +1827,24 @@ let }; }; - mhutchie.git-graph = buildVscodeMarketplaceExtension { + mechatroner.rainbow-csv = buildVscodeMarketplaceExtension { mktplcRef = { - name = "git-graph"; - publisher = "mhutchie"; - version = "1.30.0"; - sha256 = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA="; + name = "rainbow-csv"; + publisher = "mechatroner"; + version = "2.0.0"; + sha256 = "0wjlp6lah9jb0646sbi6x305idfgydb6a51pgw4wdnni02gipbrs"; }; meta = { license = lib.licenses.mit; }; }; - marp-team.marp-vscode = buildVscodeMarketplaceExtension { + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { - name = "marp-vscode"; - publisher = "marp-team"; - version = "2.4.1"; - sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; + name = "git-graph"; + publisher = "mhutchie"; + version = "1.30.0"; + sha256 = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA="; }; meta = { license = lib.licenses.mit; @@ -1893,30 +1890,6 @@ let }; }; - mskelton.one-dark-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "one-dark-theme"; - publisher = "mskelton"; - version = "1.7.2"; - sha256 = "1ks6z8wsxmlfhiwa51f7d6digvw11dlxc7mja3hankgxcf5dyj31"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - mechatroner.rainbow-csv = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "rainbow-csv"; - publisher = "mechatroner"; - version = "2.0.0"; - sha256 = "0wjlp6lah9jb0646sbi6x305idfgydb6a51pgw4wdnni02gipbrs"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-docker"; @@ -1945,7 +1918,55 @@ let }; }; - ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; + ms-pyright.pyright = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pyright"; + publisher = "ms-pyright"; + version = "1.1.282"; + sha256 = "14qkk9gbpwnbkk3dk7b7s92smj374ha7axlsi74fllw74lp4ziwn"; + }; + meta = { + description = "VS Code static type checking for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; + homepage = "https://github.com/Microsoft/pyright#readme"; + changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ratsclub ]; + }; + }; + + ms-python.python = callPackage ./ms-python.python { }; + + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pylance"; + publisher = "MS-python"; + version = "2022.7.11"; + sha256 = "sha256-JatjLZXO7iwpBwjL1hrNafBiF81CaozWWANyRm8A36Y="; + }; + + buildInputs = [ nodePackages.pyright ]; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; + description = "A performant, feature-rich language server for Python in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; + homepage = "https://github.com/microsoft/pylance-release"; + license = lib.licenses.unfree; + }; + }; + + ms-vscode.anycode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "anycode"; + publisher = "ms-vscode"; + version = "0.0.57"; + sha256 = "sha256-XwL7I+vwZJ6zx5IDZdfOUbq6M9IH/gi7MBe92cG1kDs="; + }; + meta = { + license = lib.licenses.mit; + }; + }; ms-vscode.cmake-tools = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1957,6 +1978,8 @@ let meta.license = lib.licenses.mit; }; + ms-vscode.cpptools = callPackage ./ms-vscode.cpptools { }; + ms-vscode.hexeditor = buildVscodeMarketplaceExtension { mktplcRef = { name = "hexeditor"; @@ -2015,31 +2038,26 @@ let }; }; - ms-pyright.pyright = buildVscodeMarketplaceExtension { + ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {}; + + ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { mktplcRef = { - name = "pyright"; - publisher = "ms-pyright"; - version = "1.1.282"; - sha256 = "14qkk9gbpwnbkk3dk7b7s92smj374ha7axlsi74fllw74lp4ziwn"; + name = "jupyter-keymap"; + publisher = "ms-toolsai"; + version = "1.0.0"; + sha256 = "0wkwllghadil9hk6zamh9brhgn539yhz6dlr97bzf9szyd36dzv8"; }; meta = { - description = "VS Code static type checking for Python"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; - homepage = "https://github.com/Microsoft/pyright#readme"; - changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ratsclub ]; }; }; - ms-python.python = callPackage ./ms-python.python { }; - - msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { + ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { mktplcRef = { - name = "debugger-for-chrome"; - publisher = "msjsdiag"; - version = "4.12.11"; - sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; + name = "jupyter-renderers"; + publisher = "ms-toolsai"; + version = "1.0.12"; + sha256 = "12l5z60kpz3nx77l8ck6a6w4qdzyz3xkn6k9670r30w365q9lf0z"; }; meta = { license = lib.licenses.mit; @@ -2070,38 +2088,26 @@ let }; }; - ms-toolsai.jupyter = callPackage ./ms-toolsai.jupyter {}; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - ms-toolsai.jupyter-keymap = buildVscodeMarketplaceExtension { + msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { - name = "jupyter-keymap"; - publisher = "ms-toolsai"; - version = "1.0.0"; - sha256 = "0wkwllghadil9hk6zamh9brhgn539yhz6dlr97bzf9szyd36dzv8"; + name = "debugger-for-chrome"; + publisher = "msjsdiag"; + version = "4.12.11"; + sha256 = "sha256-9i3TgCFThnFF5ccwzS4ATj5c2Xoe/4tDFGv75jJxeQ4="; }; meta = { license = lib.licenses.mit; }; }; - ms-toolsai.jupyter-renderers = buildVscodeMarketplaceExtension { + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { - name = "jupyter-renderers"; - publisher = "ms-toolsai"; - version = "1.0.12"; - sha256 = "12l5z60kpz3nx77l8ck6a6w4qdzyz3xkn6k9670r30w365q9lf0z"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - ms-vscode.anycode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "anycode"; - publisher = "ms-vscode"; - version = "0.0.57"; - sha256 = "sha256-XwL7I+vwZJ6zx5IDZdfOUbq6M9IH/gi7MBe92cG1kDs="; + name = "one-dark-theme"; + publisher = "mskelton"; + version = "1.7.2"; + sha256 = "1ks6z8wsxmlfhiwa51f7d6digvw11dlxc7mja3hankgxcf5dyj31"; }; meta = { license = lib.licenses.mit; @@ -2154,15 +2160,20 @@ let }; }; - octref.vetur = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vetur"; - publisher = "octref"; - version = "0.34.1"; - sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby"; - }; + ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { - license = lib.licenses.mit; + changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; + description = "Official OCaml Support from OCamlLabs"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; + homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.ratsclub ]; + }; + mktplcRef = { + name = "ocaml-platform"; + publisher = "ocamllabs"; + version = "1.10.7"; + sha256 = "sha256-BxVur+aSbFPyX+DW9tQcfJEyImkbTC6O0uOV2d76au0="; }; }; @@ -2182,6 +2193,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.34.1"; + sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + phoenixframework.phoenix = buildVscodeMarketplaceExtension { mktplcRef = { name = "phoenix"; @@ -2198,83 +2221,19 @@ let }; }; - redhat.java = buildVscodeMarketplaceExtension { + piousdeer.adwaita-theme = buildVscodeMarketplaceExtension { mktplcRef = { - name = "java"; - publisher = "redhat"; - version = "1.15.2023021403"; - sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; - }; - buildInputs = [ jdk ]; - meta = { - license = lib.licenses.epl20; - broken = lib.versionOlder jdk.version "11"; - }; - }; - - redhat.vscode-xml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-xml"; - publisher = "redhat"; - version = "0.23.2022120303"; - sha256 = "sha256-rQvbb7GOUwVwg/049jchJMJTwaFsOP63AovcEmr2HXs="; - }; - meta.license = lib.licenses.epl20; - }; - - redhat.vscode-yaml = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-yaml"; - publisher = "redhat"; - version = "1.11.10112022"; - sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x"; + name = "adwaita-theme"; + publisher = "piousdeer"; + version = "1.1.0"; + sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; meta = { - license = lib.licenses.mit; - }; - }; - - rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "commandOnAllFiles"; - publisher = "rioj7"; - version = "0.3.0"; - sha256 = "sha256-tNFHrgFJ22YGQgkYw+0l4G6OtlUYVn9brJPLnsvSwRE="; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-paste-and-indent"; - publisher = "Rubymaniac"; - version = "0.0.8"; - sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - - rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; - matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher - - ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { - meta = { - changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog"; - description = "Official OCaml Support from OCamlLabs"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; - homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.ratsclub ]; - }; - mktplcRef = { - name = "ocaml-platform"; - publisher = "ocamllabs"; - version = "1.10.7"; - sha256 = "sha256-BxVur+aSbFPyX+DW9tQcfJEyImkbTC6O0uOV2d76au0="; + description = "Theme for the GNOME desktop"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=piousdeer.adwaita-theme"; + homepage = "https://github.com/piousdeer/vscode-adwaita"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.wyndon ]; }; }; @@ -2302,22 +2261,6 @@ let }; }; - piousdeer.adwaita-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "adwaita-theme"; - publisher = "piousdeer"; - version = "1.1.0"; - sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; - }; - meta = { - description = "Theme for the GNOME desktop"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=piousdeer.adwaita-theme"; - homepage = "https://github.com/piousdeer/vscode-adwaita"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.wyndon ]; - }; - }; - prisma.prisma = buildVscodeMarketplaceExtension { mktplcRef = { name = "prisma"; @@ -2346,6 +2289,42 @@ let meta.license = lib.licenses.mit; }; + redhat.java = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "java"; + publisher = "redhat"; + version = "1.15.2023021403"; + sha256 = "sha256-g56+nproGC8zHidyf1Tqz0kbJrmrkgOsDA5jqaZULas="; + }; + buildInputs = [ jdk ]; + meta = { + license = lib.licenses.epl20; + broken = lib.versionOlder jdk.version "11"; + }; + }; + + redhat.vscode-yaml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-yaml"; + publisher = "redhat"; + version = "1.11.10112022"; + sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + redhat.vscode-xml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-xml"; + publisher = "redhat"; + version = "0.23.2022120303"; + sha256 = "sha256-rQvbb7GOUwVwg/049jchJMJTwaFsOP63AovcEmr2HXs="; + }; + meta.license = lib.licenses.epl20; + }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { mktplcRef = { name = "snake-trail"; @@ -2358,6 +2337,18 @@ let }; }; + rioj7.commandOnAllFiles = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "commandOnAllFiles"; + publisher = "rioj7"; + version = "0.3.0"; + sha256 = "sha256-tNFHrgFJ22YGQgkYw+0l4G6OtlUYVn9brJPLnsvSwRE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ritwickdey.liveserver = buildVscodeMarketplaceExtension { mktplcRef = { name = "liveserver"; @@ -2382,6 +2373,18 @@ let }; }; + rubymaniac.vscode-paste-and-indent = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-paste-and-indent"; + publisher = "Rubymaniac"; + version = "0.0.8"; + sha256 = "0fqwcvwq37ndms6vky8jjv0zliy6fpfkh8d9raq8hkinfxq6klgl"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -2394,6 +2397,8 @@ let }; }; + rust-lang.rust-analyzer = callPackage ./rust-lang.rust-analyzer { }; + ryu1kn.partial-diff = buildVscodeMarketplaceExtension { mktplcRef = { name = "partial-diff"; @@ -2818,18 +2823,6 @@ let }; }; - tyriar.sort-lines = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "sort-lines"; - publisher = "Tyriar"; - version = "1.9.1"; - sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - twxs.cmake = buildVscodeMarketplaceExtension { mktplcRef = { name = "cmake"; @@ -2842,6 +2835,18 @@ let }; }; + tyriar.sort-lines = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sort-lines"; + publisher = "Tyriar"; + version = "1.9.1"; + sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + usernamehw.errorlens = buildVscodeMarketplaceExtension { mktplcRef = { name = "errorlens"; @@ -2902,7 +2907,6 @@ let }; }; - vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "highlight-matching-tag"; @@ -2915,8 +2919,6 @@ let }; }; - ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; - vscjava.vscode-java-debug = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-java-debug"; @@ -3029,6 +3031,47 @@ let }; }; + waderyan.gitblame = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gitblame"; + publisher = "waderyan"; + version = "10.1.0"; + sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; + description = "Visual Studio Code Extension - See Git Blame info in status bar"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame"; + homepage = "https://github.com/Sertion/vscode-gitblame"; + license = lib.licenses.mit; + }; + }; + + WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; + + wholroyd.jinja = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jinja"; + publisher = "wholroyd"; + version = "0.0.8"; + sha256 = "1ln9gly5bb7nvbziilnay4q448h9npdh7sd9xy277122h0qawkci"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ruby"; + publisher = "wingrunr21"; + version = "0.28.0"; + sha256 = "sha256-H3f1+c31x+lgCzhgTb0uLg9Bdn3pZyJGPPwfpCYrS70="; + }; + + meta.license = lib.licenses.mit; + }; + wix.vscode-import-cost = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-import-cost"; @@ -3102,49 +3145,6 @@ let }; }; - llvm-org.lldb-vscode = llvmPackages_8.lldb; - - waderyan.gitblame = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "gitblame"; - publisher = "waderyan"; - version = "10.1.0"; - sha256 = "TTYBaJ4gcMVICz4bGZTvbNRPpWD4tXuAJbI8QcHNDv0="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; - description = "Visual Studio Code Extension - See Git Blame info in status bar"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame"; - homepage = "https://github.com/Sertion/vscode-gitblame"; - license = lib.licenses.mit; - }; - }; - - WakaTime.vscode-wakatime = callPackage ./WakaTime.vscode-wakatime { }; - - wingrunr21.vscode-ruby = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-ruby"; - publisher = "wingrunr21"; - version = "0.28.0"; - sha256 = "sha256-H3f1+c31x+lgCzhgTb0uLg9Bdn3pZyJGPPwfpCYrS70="; - }; - - meta.license = lib.licenses.mit; - }; - - wholroyd.jinja = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "jinja"; - publisher = "wholroyd"; - version = "0.0.8"; - sha256 = "1ln9gly5bb7nvbziilnay4q448h9npdh7sd9xy277122h0qawkci"; - }; - meta = { - license = lib.licenses.mit; - }; - }; - zhwu95.riscv = buildVscodeMarketplaceExtension { mktplcRef = { name = "riscv"; @@ -3177,6 +3177,7 @@ let license = lib.licenses.mit; }; }; + }; aliases = self: super: { From c19b09c24314ce694c427518c885bf2e4574135e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 18 Mar 2023 16:02:01 -0400 Subject: [PATCH 32/36] tdesktop: fix aarch64 build failures --- .../instant-messengers/telegram/tdesktop/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3066a3aa745b..2bdaa0c63551 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -54,7 +54,6 @@ , microsoft_gsl , rlottie , stdenv -, gcc10Stdenv }: # Main reference: @@ -70,10 +69,8 @@ let cxxStandard = "20"; }; }; - # Aarch64 default gcc9 will cause ICE. For reference #108305 - env = if stdenv.isAarch64 then gcc10Stdenv else stdenv; in -env.mkDerivation rec { +stdenv.mkDerivation rec { pname = "telegram-desktop"; version = "4.6.5"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py From 2c76d9ce17ead0cd663b03e6ce4f2e07da250b84 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 17 Mar 2023 09:32:04 -0700 Subject: [PATCH 33/36] bcompare: fix missing ldd --- pkgs/applications/version-management/bcompare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 409652888caf..015fca96182b 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -41,7 +41,7 @@ let substituteInPlace $out/bin/${pname} \ --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ - --replace "ldd" "${glibc.out}/bin/ldd" \ + --replace "ldd" "${glibc.bin}/bin/ldd" \ --replace "/bin/bash" "${runtimeShell}" # Create symlink bzip2 library From 007590313787ea34a145a0dae0fa10b9454122ed Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 17 Mar 2023 13:04:17 -0400 Subject: [PATCH 34/36] minidsp: init at 0.1.9 --- pkgs/applications/audio/minidsp/default.nix | 40 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/minidsp/default.nix diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix new file mode 100644 index 000000000000..bccd3dd157f3 --- /dev/null +++ b/pkgs/applications/audio/minidsp/default.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, + libusb1, + AppKit, + IOKit, + pkg-config, +}: +rustPlatform.buildRustPackage rec { + pname = "minidsp"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "mrene"; + repo = "minidsp-rs"; + # v0.1.9 tag is out of date, cargo lock fixed in next commit on main + rev = "b03a95a05917f20b9c3153c03e4e99dd943d9f6f"; + hash = "sha256-uZBrX3VCCpr7AY82PgR596mncL5wWDK7bpx2m/jCJBE="; + }; + + cargoHash = "sha256-0PyojyimxnwEtHA98Npf4eHvycjuXdPrrIFilVuEnQk="; + + cargoBuildFlags = ["-p minidsp -p minidsp-daemon"]; + + buildInputs = + lib.optionals stdenv.isLinux [libusb1] + ++ lib.optionals stdenv.isDarwin [AppKit IOKit]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config]; + + meta = with lib; { + description = "A control interface for some MiniDSP products"; + homepage = "https://github.com/mrene/minidsp-rs"; + license = licenses.asl20; + platforms = platforms.linux ++ platforms.darwin; + maintainers = [maintainers.adamcstephens]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e6137229de3..b41fc209c3c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31681,6 +31681,10 @@ with pkgs; miniaudicle = callPackage ../applications/audio/miniaudicle { stdenv = gcc10StdenvCompat; }; + minidsp = callPackage ../applications/audio/minidsp { + inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + }; + minicom = callPackage ../tools/misc/minicom { }; minigalaxy = callPackage ../applications/misc/minigalaxy { }; From f967d005f762bc209ba6d2c36d985d71edb136a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Mar 2023 20:11:27 +0100 Subject: [PATCH 35/36] telegraf: 1.25.1 -> 1.26.0 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index be3b102bfbe5..8277ea107f96 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.25.1"; + version = "1.26.0"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-r+kbF4TajBkZyp0B6Tb/Y1Nm7e2zQctDYEmyn0qTqW0="; + sha256 = "sha256-Huyjgo6UC9l6DVWBaKvN7ETxzsLDSaDC5Qx+gCR4LU4="; }; - vendorHash = "sha256-AlmmWjwhC5xStcwo+NW0IwC+FteL4Ttwo717VgE8IHM="; + vendorHash = "sha256-Z1xmtQ/Cs+7gdipEip/nkxARtuCYG1lZ59bGNhPjTcA="; proxyVendor = true; ldflags = [ From 9087a3b0f2a5c263c488bc142371d08a396b629d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 22:55:15 +0000 Subject: [PATCH 36/36] jackett: 0.20.3599 -> 0.20.3627 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8f27c648b309..5bc102caa616 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3599"; + version = "0.20.3627"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-GZCdReOysCkFCkOeaqRivJlKRsuKtRNMPTdKsbj6KqyhPW41GLJffBkl8XKi6pmREp/jCtWs2+tw1D7xcaGNqg=="; + hash = "sha512-enyxUGfS7nzy4Ej+raPbhUc+WJJQL5J3i8WhoVsYBDwlcfW0kXjljhipPqkW4bONTRKL3zLI4HbaHEW1t/Ca/g=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj";