From 8c3a2b0a104fe7af24901c7bc7970c606c9abbae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 9 Dec 2023 23:42:41 +0100 Subject: [PATCH 001/311] nixos/portunus: add note about allowed characters to id --- nixos/modules/services/misc/portunus.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index ab78479c96cd..61eb8f0b10c3 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -98,6 +98,10 @@ in The OIDC secret must be set as the `DEX_CLIENT_''${id}` environment variable in the [](#opt-services.dex.environmentFile) setting. + + ::: {.note} + Make sure the id only contains characters that are allowed in an environment variable name, e.g. no -. + ::: ''; }; From e4de1c0b19fd9a968b306a5bab27f2245773e57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 28 Apr 2024 18:18:18 +0200 Subject: [PATCH 002/311] nixos/bitwarden-directory-connector-cli: add wants network-online.target This fixes the following warning: trace: warning: bitwarden-directory-connector-cli.timer is ordered after 'network-online.target' but doesn't depend on it --- .../services/security/bitwarden-directory-connector-cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix index d21322caf4c3..fef4a8864897 100644 --- a/nixos/modules/services/security/bitwarden-directory-connector-cli.nix +++ b/nixos/modules/services/security/bitwarden-directory-connector-cli.nix @@ -260,6 +260,7 @@ in { description = "Sync timer for Bitwarden Directory Connector"; wantedBy = ["timers.target"]; after = ["network-online.target"]; + wants = ["network-online.target"]; timerConfig = { OnCalendar = cfg.interval; Unit = "bitwarden-directory-connector-cli.service"; From fa232f0a93620de50e14724c5f13b71ff2df4eb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 06:50:29 +0000 Subject: [PATCH 003/311] matio: 1.5.26 -> 1.5.27 --- pkgs/development/libraries/matio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index aebd14780636..bf4c1f724e16 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.26"; + version = "1.5.27"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-i0fCn1jkaNunpVVTccanKtTGqosV9FmysLZaMDwGOTM="; + sha256 = "sha256-CmqgCxjEUStjqNJ5BrB5yMbtQdSyhE96SuWY4Y0i07M="; }; meta = with lib; { From 068981b87b1de8dc60911bf1f857d91e13f77abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 May 2024 11:34:47 +0000 Subject: [PATCH 004/311] libpkgconf: 2.1.1 -> 2.2.0 --- pkgs/by-name/li/libpkgconf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix index bfa79f3c2532..ffeb136862df 100644 --- a/pkgs/by-name/li/libpkgconf/package.nix +++ b/pkgs/by-name/li/libpkgconf/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkgconf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "https://distfiles.dereferenced.org/pkgconf/pkgconf-${finalAttrs.version}.tar.xz"; - hash = "sha256-OiJPKszwkbd6V4Exbie57juoLAg8wuU54IlAtopE/sU="; + hash = "sha256-sG/2OoNTaqjC9kIvqArUXkgz9ZAmb+sU6t3+HUyFPGk="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; From fcab5d3e0afebe7a9a8b338decbe86b45f38c4af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 01:21:56 +0000 Subject: [PATCH 005/311] gdcm: 3.0.23 -> 3.0.24 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 9d6db6fca684..18058af21cb1 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "refs/tags/v${version}"; - hash = "sha256-zwIPWcjTrfbdNBzAqwV6lU2l6sx+e4Yi7dprdem6AeE="; + hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE="; }; cmakeFlags = [ From 8e729c70a1192691fc4eb93017415de88d791883 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 May 2024 09:40:42 +0000 Subject: [PATCH 006/311] enet: 1.3.17 -> 1.3.18 --- pkgs/development/libraries/enet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 53aec96fe705..cb57f5a2f07e 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "enet"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz"; - sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3"; + sha256 = "sha256-KooMU2DWi7T80R8uTEfGmXbo0shbEJ3X1gsRgaT4XTY="; }; meta = { From f96a90834c5e2fb1fd9cebfba862c6d5a01f7601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 03:09:12 +0000 Subject: [PATCH 007/311] secp256k1: 0.4.1 -> 0.5.0 --- pkgs/tools/security/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 5494f8f26c24..335d9c5c18a5 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-atq34GnWkSkWTWxZP4PCSF3hIjGFhQ534E+WUtLRkiM="; + sha256 = "sha256-XcxBzOJngrm1szs48bBS6pcH2yaLfLKPUtyQ51eItaw="; }; nativeBuildInputs = [ autoreconfHook ]; From 24d453186792290a2188343c289d6504daecc5aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 09:08:22 +0000 Subject: [PATCH 008/311] python311Packages.minio: 7.2.6 -> 7.2.7 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index de84597491c8..f1321bb53bc3 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.6"; + version = "7.2.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-zK+D2DNgh1cASdA2gstNW0ODUu7Dn6vMY01mcrdSSo0="; + hash = "sha256-Qb3KPwSODtIqwS4FfR+DHphx4duPsNdMlHt2rpdV2+Y="; }; postPatch = '' From fe06c43d7091c56c8e054b71c64ce81628fa6f13 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 7 May 2024 11:36:55 +0200 Subject: [PATCH 009/311] gauche: remove dependency onto gaucheBootstrap This reduces closure size of the built package by about a third. The only reference to gaucheBootstrap in the built package was in $out/share/gauche-0.98/0.9.13/package-templates/configure, where it is incorrect: anyone using the template shipped with the gauche package would have unintentially used the bootstrap version of gauche instead. --- pkgs/development/interpreters/gauche/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index aa58be639b9d..d596455fe015 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { ''; postPatch = '' + substituteInPlace ext/package-templates/configure \ + --replace "#!/usr/bin/env gosh" "#!$out/bin/gosh" patchShebangs . ''; From 4581de4df40093b08190109759b25e889e36dab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 May 2024 21:55:43 +0000 Subject: [PATCH 010/311] python311Packages.truststore: 0.8.0 -> 0.9.1 --- pkgs/development/python-modules/truststore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index 961799efeb72..15bc03d26632 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.8.0"; + version = "0.9.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K11nHzpckNR8pqmgLOo/yCJ2cNQnqPHgjMDPQkpeRkQ="; + hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU="; }; nativeBuildInputs = [ From 7441c52c79c7b4d7bcc8aef9c4bedda431319486 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 8 May 2024 20:46:41 +0800 Subject: [PATCH 011/311] pantheon.elementary-gtk-theme: 7.3.0 -> 8.0.0 https://github.com/elementary/stylesheet/compare/7.3.0...8.0.0 --- .../pantheon/artwork/elementary-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index f2946f499202..dbc6b6d060c8 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "7.3.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "stylesheet"; rev = version; - sha256 = "sha256-KrpeDQH43n7seeSPVYKETxy1g0JuUowZerjgktLQg/4="; + sha256 = "sha256-O0Zu/ZxVANfWKcCkOF7jeJa3oG1ut56px7jeFK7LdKA="; }; nativeBuildInputs = [ From 705a99f06720bfebea078d81ea3b57256ed87579 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 May 2024 13:26:37 +0000 Subject: [PATCH 012/311] nghttp3: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/nghttp3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 849a464b1c0d..bb7e56ee4240 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-kJt4aQGNiJ0XhlEKunR8jYKytv3rh23jRrNelCDe/Kk="; + hash = "sha256-MPycG8Fd7GJnp7WyFlGzbuTCYIF+xq6I7oeqXKFOehQ="; fetchSubmodules = true; }; From 7a2be5b7d6a28def87520629f25b8ae5fd167a4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 May 2024 00:43:19 +0000 Subject: [PATCH 013/311] miniupnpc: 2.2.6 -> 2.2.7 --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index f1a639b72060..f9b8f0c536fa 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-N/zZGVNQjD5i1pZLuP+8XUfz4TSB+lTmIU/MaHBMZvE="; + sha256 = "sha256-sMOicFaED9DskyilqbrD3F4OxtLoczNJz1d7CqHnCsE="; }; nativeBuildInputs = [ cmake ]; From 8eea66b3f69ad1cd47c5359271d2833d40f5de65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:25:33 +0000 Subject: [PATCH 014/311] goperf: 0-unstable-2023-11-08 -> 0-unstable-2024-05-10 --- pkgs/development/tools/goperf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index ffb644aaea40..b4147456711d 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2023-11-08"; + version = "0-unstable-2024-05-10"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "cb71e802ccb878a069712546879bf26489f0f300"; - hash = "sha256-1NvrelLsy9lrepttXXnggc0oycC6EgJgU80iXDu3IoI="; + rev = "bedb9135df6d63a551db71a3fa872a2816e90cf2"; + hash = "sha256-e2dr/eeKoc0Vpxx29bmxhfYsj13oEFs9h1/mBmDbWM4="; }; - vendorHash = "sha256-dJQHqIR6v0yYbxplytkdA98IHtdxnsvi9X6kIESCsB8="; + vendorHash = "sha256-MtDvOn+cjlEtObzmYnsQa2BkgIeKr/j18wk5QK3JDuk="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf From 1de1b81f12c9df498039378d26cd2549cde7f9d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 20:54:11 +0000 Subject: [PATCH 015/311] syncplay: 1.7.2 -> 1.7.3 --- pkgs/applications/networking/syncplay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4321868a0d6d..b816da9e4b5c 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -13,15 +13,15 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.7.2"; + version = "1.7.3"; format = "other"; src = fetchFromGitHub { owner = "Syncplay"; repo = "syncplay"; - rev = "v${version}"; - sha256 = "sha256-PERPE6141LXmb8fmW17Vu54Unpf9vEK+ahm6q1byRTU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ipo027XyN4BpMkxzXznbnaufsaG/YkHxFJYo+XWzbyE="; }; patches = [ From 146148e3232ee4edbb4091f94a30ffd873065aaa Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 14 May 2024 19:40:55 +0200 Subject: [PATCH 016/311] espanso: 2.1.8 -> 2.2.1 --- pkgs/applications/office/espanso/Cargo.lock | 1118 ++++++++++++------ pkgs/applications/office/espanso/default.nix | 37 +- 2 files changed, 767 insertions(+), 388 deletions(-) diff --git a/pkgs/applications/office/espanso/Cargo.lock b/pkgs/applications/office/espanso/Cargo.lock index 82f195f1b7b7..fcceab7b700a 100644 --- a/pkgs/applications/office/espanso/Cargo.lock +++ b/pkgs/applications/office/espanso/Cargo.lock @@ -59,16 +59,16 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.18", "libc", "winapi 0.3.9", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -76,6 +76,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "bitflags" version = "0.9.1" @@ -88,6 +94,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "blake2b_simd" version = "0.5.11" @@ -131,6 +143,26 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "byteorder" version = "1.4.3" @@ -145,9 +177,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", @@ -166,12 +198,28 @@ dependencies = [ [[package]] name = "calloop" -version = "0.9.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ + "bitflags 2.4.1", "log", - "nix 0.22.3", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", ] [[package]] @@ -180,7 +228,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c088f2dddef283f86b023ab1ebe2301c653326834996458b2f48d29b804e9540" dependencies = [ - "errno", + "errno 0.2.7", "libc", "thiserror", ] @@ -243,6 +291,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.14.1" @@ -258,12 +315,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "const-sha1" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" - [[package]] name = "const_format" version = "0.2.14" @@ -280,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29c36c619c422113552db4eb28cddba8faa757e33f758cc3415bd2885977b591" dependencies = [ "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "unicode-xid 0.2.1", ] @@ -385,13 +436,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "cstr_core" @@ -409,7 +456,7 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" dependencies = [ - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] @@ -419,6 +466,25 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "dashmap" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.12.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "dbus" version = "0.9.1" @@ -495,9 +561,9 @@ dependencies = [ [[package]] name = "dlib" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ "libloading", ] @@ -553,12 +619,30 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" dependencies = [ - "heck", + "heck 0.3.2", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.7" @@ -570,6 +654,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.1" @@ -582,7 +676,7 @@ dependencies = [ [[package]] name = "espanso" -version = "2.1.8" +version = "2.2.1" dependencies = [ "anyhow", "caps", @@ -592,7 +686,7 @@ dependencies = [ "crossbeam", "dialoguer", "dirs 3.0.1", - "enum-as-inner", + "enum-as-inner 0.3.3", "espanso-clipboard", "espanso-config", "espanso-detect", @@ -615,7 +709,6 @@ dependencies = [ "libc", "log", "log-panics", - "maplit", "named_pipe", "notify", "opener", @@ -638,8 +731,6 @@ version = "0.1.0" dependencies = [ "anyhow", "cc", - "lazy_static", - "lazycell", "log", "thiserror", "wait-timeout", @@ -652,7 +743,7 @@ version = "0.1.0" dependencies = [ "anyhow", "dunce", - "enum-as-inner", + "enum-as-inner 0.6.0", "glob", "indoc", "lazy_static", @@ -674,7 +765,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cc", - "enum-as-inner", + "enum-as-inner 0.6.0", "lazy_static", "lazycell", "libc", @@ -695,7 +786,6 @@ dependencies = [ "html2text", "log", "markdown", - "tempdir", "thiserror", ] @@ -705,10 +795,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cc", - "lazy_static", - "lazycell", "log", - "thiserror", "widestring", ] @@ -718,10 +805,9 @@ version = "0.1.0" dependencies = [ "anyhow", "cc", - "enum-as-inner", + "enum-as-inner 0.6.0", "itertools", "lazy_static", - "lazycell", "libc", "log", "regex", @@ -735,7 +821,6 @@ name = "espanso-ipc" version = "0.1.0" dependencies = [ "anyhow", - "crossbeam", "log", "named_pipe", "serde", @@ -748,7 +833,6 @@ name = "espanso-kvs" version = "0.1.0" dependencies = [ "anyhow", - "log", "serde", "serde_json", "tempdir", @@ -759,23 +843,17 @@ dependencies = [ name = "espanso-mac-utils" version = "0.1.0" dependencies = [ - "anyhow", "cc", "lazy_static", - "lazycell", - "log", "regex", - "thiserror", ] [[package]] name = "espanso-match" version = "0.1.0" dependencies = [ - "anyhow", "log", "regex", - "thiserror", "unicase", ] @@ -784,17 +862,14 @@ name = "espanso-migrate" version = "0.1.0" dependencies = [ "anyhow", - "dunce", "fs_extra", "glob", "include_dir", "lazy_static", - "log", "path-slash", "pretty_assertions", "regex", "tempdir", - "tempfile", "test-case", "thiserror", "walkdir", @@ -809,10 +884,8 @@ dependencies = [ "cc", "glob", "lazy_static", - "log", "regex", "serde", - "serde_json", "thiserror", "winres", "zip", @@ -845,10 +918,8 @@ dependencies = [ name = "espanso-path" version = "0.1.0" dependencies = [ - "anyhow", "dirs 3.0.1", "log", - "thiserror", ] [[package]] @@ -857,7 +928,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "enum-as-inner", + "enum-as-inner 0.6.0", "lazy_static", "log", "rand 0.8.3", @@ -881,7 +952,7 @@ dependencies = [ "serde_json", "thiserror", "widestring", - "winrt-notification 0.3.1", + "winrt-notification 0.5.1", ] [[package]] @@ -966,9 +1037,9 @@ dependencies = [ [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsevent" @@ -1042,19 +1113,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" -[[package]] -name = "futures-macro" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" -dependencies = [ - "autocfg", - "proc-macro-hack", - "proc-macro2", - "quote 1.0.9", - "syn 1.0.67", -] - [[package]] name = "futures-sink" version = "0.3.17" @@ -1076,13 +1134,10 @@ dependencies = [ "autocfg", "futures-core", "futures-io", - "futures-macro", "futures-task", "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1132,9 +1187,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.4" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1151,9 +1206,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1164,6 +1225,12 @@ dependencies = [ "unicode-segmentation", ] +[[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.18" @@ -1173,6 +1240,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + [[package]] name = "hex" version = "0.4.3" @@ -1181,26 +1254,30 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "html2text" -version = "0.2.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" +checksum = "22f0de8bd2c9fe69eb3fa29e41ae1396c9d2e1b807735acaecafb4c86888674f" dependencies = [ + "dashmap", "html5ever", - "markup5ever_rcdom", + "markup5ever", + "tendril", + "thiserror", "unicode-width", + "xml5ever", ] [[package]] name = "html5ever" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", "markup5ever", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] @@ -1212,7 +1289,7 @@ checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 0.4.7", ] [[package]] @@ -1228,9 +1305,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1240,9 +1317,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "hyper" -version = "0.14.12" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1253,7 +1330,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 1.0.6", "pin-project-lite", "socket2", "tokio", @@ -1264,17 +1341,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "futures-util", + "http", "hyper", - "log", "rustls", "tokio", "tokio-rustls", - "webpki", ] [[package]] @@ -1321,18 +1396,18 @@ dependencies = [ "anyhow", "proc-macro-hack", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] [[package]] name = "indexmap" -version = "1.7.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ - "autocfg", - "hashbrown", + "equivalent", + "hashbrown 0.14.3", ] [[package]] @@ -1394,6 +1469,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + [[package]] name = "js-sys" version = "0.3.53" @@ -1427,9 +1508,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -1456,6 +1537,22 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.14" @@ -1501,12 +1598,6 @@ dependencies = [ "libc", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "markdown" version = "0.3.0" @@ -1520,9 +1611,9 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", "phf", @@ -1532,18 +1623,6 @@ dependencies = [ "tendril", ] -[[package]] -name = "markup5ever_rcdom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - [[package]] name = "matches" version = "0.1.9" @@ -1558,9 +1637,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.3.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -1603,7 +1691,7 @@ dependencies = [ "kernel32-sys", "libc", "log", - "miow 0.2.2", + "miow", "net2", "slab", "winapi 0.2.8", @@ -1611,15 +1699,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", ] [[package]] @@ -1646,15 +1733,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "mockall" version = "0.9.1" @@ -1678,7 +1756,7 @@ checksum = "5dd4234635bca06fc96c7368d038061e0aae1b00a764dc817e900dc974e3deea" dependencies = [ "cfg-if 1.0.0", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] @@ -1693,9 +1771,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -1732,31 +1810,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags 1.2.1", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags 1.2.1", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - [[package]] name = "nom" version = "6.1.2" @@ -1804,9 +1857,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi 0.3.9", ] @@ -1836,7 +1889,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.18", "libc", ] @@ -1871,9 +1924,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.8.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -1893,18 +1946,30 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.36" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.67", +] + [[package]] name = "openssl-probe" version = "0.1.4" @@ -1913,11 +1978,10 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.66" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1942,6 +2006,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + [[package]] name = "path-slash" version = "0.1.4" @@ -1956,21 +2033,21 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "phf" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_shared", + "phf_shared 0.10.0", ] [[package]] name = "phf_codegen" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.10.0", + "phf_shared 0.10.0", ] [[package]] @@ -1979,10 +2056,20 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.3", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -1993,10 +2080,19 @@ dependencies = [ ] [[package]] -name = "pin-project-lite" -version = "0.2.7" +name = "phf_shared" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2016,6 +2112,21 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +[[package]] +name = "polling" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "hermit-abi 0.3.9", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "ppv-lite86" version = "0.2.10" @@ -2075,19 +2186,13 @@ version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ - "unicode-xid 0.2.1", + "unicode-ident", ] [[package]] @@ -2096,6 +2201,15 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45c49fc4f91f35bae654f85ebb3a44d60ac64f11b3166ffa609def390c732d8" +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "0.3.15" @@ -2104,9 +2218,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2278,6 +2392,15 @@ dependencies = [ "bitflags 1.2.1", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.2.1", +] + [[package]] name = "redox_users" version = "0.3.5" @@ -2323,15 +2446,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.4" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -2339,24 +2463,27 @@ dependencies = [ "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "rustls", + "rustls-pemfile", "serde", + "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", "tokio-rustls", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg 0.7.0", + "winreg 0.10.1", ] [[package]] @@ -2380,25 +2507,46 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", "crossbeam-utils", ] [[package]] -name = "rustls" -version = "0.19.1" +name = "rustix" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.4.1", + "errno 0.3.8", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "base64", "log", "ring", "sct", "webpki", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.0", +] + [[package]] name = "ryu" version = "1.0.5" @@ -2438,9 +2586,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sct" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ "ring", "untrusted", @@ -2485,7 +2633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" dependencies = [ "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] @@ -2495,19 +2643,19 @@ version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" dependencies = [ - "itoa", + "itoa 0.4.7", "ryu", "serde", ] [[package]] name = "serde_urlencoded" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.6", "ryu", "serde", ] @@ -2556,40 +2704,52 @@ checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" [[package]] name = "slab" -version = "0.4.3" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.15.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.4.1", + "bytemuck", "calloop", - "dlib", - "lazy_static", + "calloop-wayland-source", + "cursor-icon", + "libc", "log", - "memmap2", - "nix 0.22.3", + "memmap2 0.9.4", "pkg-config", + "rustix", + "thiserror", + "wayland-backend", "wayland-client", + "wayland-csd-frame", "wayland-cursor", "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", ] [[package]] name = "socket2" -version = "0.4.1" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -2601,12 +2761,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "squote" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d" - [[package]] name = "string_cache" version = "0.8.1" @@ -2615,7 +2769,7 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared", + "phf_shared 0.8.0", "precomputed-hash", "serde", ] @@ -2626,10 +2780,10 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", ] [[package]] @@ -2646,11 +2800,11 @@ checksum = "4ca6e4730f517e041e547ffe23d29daab8de6b73af4b6ae2a002108169f5e7da" [[package]] name = "strum" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" dependencies = [ - "strum_macros 0.20.1", + "strum_macros 0.22.0", ] [[package]] @@ -2665,13 +2819,13 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ - "heck", + "heck 0.3.2", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", ] @@ -2693,10 +2847,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "unicode-xid 0.2.1", ] +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "unicode-ident", +] + [[package]] name = "synom" version = "0.11.3" @@ -2721,9 +2886,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.24.5" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d80929a3b477bce3a64360ca82bfb361eacce1dcb7b1fb31e8e5e181e37c212" +checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -2796,7 +2961,7 @@ checksum = "956044ef122917dde830c19dec5f76d0670329fde4104836d62ebcb14f4865f1" dependencies = [ "cfg-if 1.0.0", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", "version_check", ] @@ -2812,22 +2977,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", - "quote 1.0.9", - "syn 1.0.67", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -2858,18 +3023,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.10.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", "libc", - "memchr", - "mio 0.7.13", + "mio 0.8.6", "num_cpus", "pin-project-lite", - "winapi 0.3.9", + "socket2", + "windows-sys 0.48.0", ] [[package]] @@ -2884,9 +3049,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -2895,16 +3060,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.7" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", + "tracing", ] [[package]] @@ -2924,22 +3089,21 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "pin-project-lite", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -2975,6 +3139,12 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -3098,6 +3268,12 @@ 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.76" @@ -3105,8 +3281,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if 1.0.0", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -3120,7 +3294,7 @@ dependencies = [ "lazy_static", "log", "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", "wasm-bindgen-shared", ] @@ -3143,7 +3317,7 @@ version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ - "quote 1.0.9", + "quote 1.0.35", "wasm-bindgen-macro-support", ] @@ -3154,7 +3328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ "proc-macro2", - "quote 1.0.9", + "quote 1.0.35", "syn 1.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -3167,75 +3341,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] -name = "wayland-client" -version = "0.29.5" +name = "wayland-backend" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ - "bitflags 1.2.1", + "cc", "downcast-rs", - "libc", - "nix 0.24.2", + "rustix", "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.2", - "once_cell", "smallvec", "wayland-sys", ] [[package]] -name = "wayland-cursor" -version = "0.29.5" +name = "wayland-client" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "nix 0.24.2", + "bitflags 2.4.1", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.1", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.29.5" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 1.2.1", + "bitflags 2.4.1", + "wayland-backend", "wayland-client", - "wayland-commons", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", - "quote 1.0.9", - "xml-rs 0.8.3", + "quick-xml", + "quote 1.0.35", ] [[package]] name = "wayland-sys" -version = "0.29.5" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ "dlib", - "lazy_static", + "log", "pkg-config", ] @@ -3251,9 +3447,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ "ring", "untrusted", @@ -3261,9 +3457,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -3319,84 +3515,238 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.3.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426842497696b65fbfc575691d94ef65befb248ed1a8c4361e293c724e7ebe61" +checksum = "a9f39345ae0c8ab072c0ac7fe8a8b411636aa34f89be19ddd0d9226544f13944" dependencies = [ - "const-sha1", - "windows_gen", - "windows_macros", - "windows_winmd", + "windows_i686_gnu 0.24.0", + "windows_i686_msvc 0.24.0", + "windows_x86_64_gnu 0.24.0", + "windows_x86_64_msvc 0.24.0", ] [[package]] -name = "windows_gen" -version = "0.3.1" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac8f0f06b647f42ee5459a8e1ffe41795647582c5926ec3fa363a91aad7d77" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "proc-macro2", - "quote 1.0.9", - "squote", - "syn 1.0.67", - "windows_gen_macros", - "windows_winmd", + "windows-targets 0.42.2", ] [[package]] -name = "windows_gen_macros" -version = "0.3.1" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eac2169a20173b890c496f9e0e1149a92ef29fe4ba96026b72eec363b993f9" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "proc-macro2", - "quote 1.0.9", - "syn 1.0.67", + "windows-targets 0.48.5", ] [[package]] -name = "windows_macros" -version = "0.3.1" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edc57c944eec106c7823b425ab0fd9f90163489e50a4df747f65fcf9030e1fb" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "proc-macro2", - "quote 1.0.9", - "squote", - "syn 1.0.67", - "windows_gen", - "windows_winmd", + "windows-targets 0.52.4", ] [[package]] -name = "windows_winmd" -version = "0.3.1" +name = "windows-targets" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d44527d04c9713312ed598f5d6ce3c453754dbfc03ddc376615be4415ffc88" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_winmd_macros", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] -name = "windows_winmd_macros" -version = "0.3.1" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2353f43f512938450614a176abf2b6cb31ac3b84fd71c88470fee571303e3f36" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "proc-macro2", - "quote 1.0.9", - "syn 1.0.67", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] -name = "winreg" -version = "0.7.0" +name = "windows-targets" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "winapi 0.3.9", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0866510a3eca9aed73a077490bbbf03e5eaac4e1fd70849d89539e5830501fd" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0ffed56b7e9369a29078d2ab3aaeceea48eb58999d2cff3aa2494a275b95c6" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384a173630588044205a2993b6864a2f56e5a8c1e7668c07b93ec18cf4888dc4" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd8f062d8ca5446358159d79a90be12c543b3a965c847c8f3eedf14b321d399" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + [[package]] name = "winreg" version = "0.9.0" @@ -3406,6 +3756,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "winres" version = "0.1.11" @@ -3439,13 +3798,13 @@ dependencies = [ [[package]] name = "winrt-notification" -version = "0.3.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ee9845acda665033013f93baec4f71ac0e60a391b530a5a83bdb966c1807ca" +checksum = "007a0353840b23e0c6dc73e5b962ff58ed7f6bc9ceff3ce7fe6fbad8d496edf4" dependencies = [ - "strum 0.20.0", + "strum 0.22.0", "windows", - "xml-rs 0.8.3", + "xml-rs 0.8.8", ] [[package]] @@ -3467,6 +3826,26 @@ dependencies = [ "nom", ] +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + [[package]] name = "xml-rs" version = "0.6.1" @@ -3478,20 +3857,19 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.3" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" +checksum = "4f20f14e2bd1fef6ec891d50dbb37c7290a0568a6bbd9020bf62010d02b6f80e" [[package]] name = "xml5ever" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" +checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" dependencies = [ "log", "mac", "markup5ever", - "time", ] [[package]] diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index daa0114b018c..518683046ddd 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -39,13 +39,13 @@ assert stdenv.isDarwin -> !x11Support; assert stdenv.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "2.1.8"; + version = "2.2.1"; src = fetchFromGitHub { owner = "espanso"; repo = "espanso"; rev = "v${version}"; - hash = "sha256-5TUo5B1UZZARgTHbK2+520e3mGZkZ5tTez1qvZvMnxs="; + hash = "sha256-41oF7aBxCy+Vbm1Tbx2qMkdywxVJpnH/kmKMtpgvWwc="; }; cargoLock = { @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "modulo" - ] ++ lib.optionals waylandSupport[ + ] ++ lib.optionals waylandSupport [ "wayland" ] ++ lib.optionals stdenv.isLinux [ "vendored-tls" @@ -123,21 +123,22 @@ rustPlatform.buildRustPackage rec { # Some tests require networking doCheck = false; - postInstall = if stdenv.isDarwin then '' - EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh - '' else '' - wrapProgram $out/bin/espanso \ - --prefix PATH : ${lib.makeBinPath ( - lib.optionals stdenv.isLinux [ - libnotify - setxkbmap - ] ++ lib.optionals waylandSupport [ - wl-clipboard - ] ++ lib.optionals x11Support [ - xclip - ] - )} - ''; + postInstall = + if stdenv.isDarwin then '' + EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh + '' else '' + wrapProgram $out/bin/espanso \ + --prefix PATH : ${lib.makeBinPath ( + lib.optionals stdenv.isLinux [ + libnotify + setxkbmap + ] ++ lib.optionals waylandSupport [ + wl-clipboard + ] ++ lib.optionals x11Support [ + xclip + ] + )} + ''; passthru.tests.version = testers.testVersion { package = espanso; From 0062a1d3305118b17c3854e92db78b464313b799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A9=20Dupuis?= Date: Thu, 16 May 2024 16:44:30 -0700 Subject: [PATCH 017/311] rexml: 3.2.6 -> 3.2.8 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 0528d45bef84..18819de3029c 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3127,10 +3127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "sha256-CQioY4HZ+XOCRoDfTgp1QidmJy8DscDknbfnnCPbETU="; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; rmagick = { dependencies = ["observer" "pkg-config"]; From f8e39fefa362336351008c6d6824738d8235a3b8 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 14 May 2024 20:39:32 +0200 Subject: [PATCH 018/311] espanso: 2.2.1 -> 2.2-unstable-2024-05-14 --- pkgs/applications/office/espanso/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 518683046ddd..b9e00a5ec313 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -39,13 +39,13 @@ assert stdenv.isDarwin -> !x11Support; assert stdenv.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "2.2.1"; + version = "2.2-unstable-2024-05-14"; src = fetchFromGitHub { owner = "espanso"; repo = "espanso"; - rev = "v${version}"; - hash = "sha256-41oF7aBxCy+Vbm1Tbx2qMkdywxVJpnH/kmKMtpgvWwc="; + rev = "8daadcc949c35a7b7aa20b7f544fdcff83e2c5f7"; + hash = "sha256-4MArENBmX6tDVLZE1O8cuJe7A0R+sLZoxBkDvIwIVZ4="; }; cargoLock = { @@ -142,6 +142,8 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = espanso; + # remove when updating to a release version + version = "2.2.1"; }; meta = with lib; { From 85814f82e05e85383738692d5b51e4969b4ccbf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 May 2024 09:51:27 +0200 Subject: [PATCH 019/311] ruler: refactor --- pkgs/tools/security/ruler/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/tools/security/ruler/default.nix index 6389c0eac041..94fa0a83424b 100644 --- a/pkgs/tools/security/ruler/default.nix +++ b/pkgs/tools/security/ruler/default.nix @@ -9,17 +9,24 @@ buildGoModule rec { src = fetchFromGitHub { owner = "sensepost"; - repo = pname; - rev = version; + repo = "ruler"; + rev = "refs/tags/${version}"; hash = "sha256-cEYpK1LB9b65xr6MCMax1vUtSWefjJdXNs4sPgx65d0="; }; vendorHash = "sha256-ITd3cvZmRBWK3922dDRvNHNH8KzHoVfIQI6S318ibxA="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to abuse Exchange services"; homepage = "https://github.com/sensepost/ruler"; + changelog = "https://github.com/sensepost/ruler/releases/tag/${version}"; license = with licenses; [ cc-by-nc-40 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "ruler"; }; } From 07f9f358bf1297e2f7134f0793b42d14df20c5e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 May 2024 09:51:53 +0200 Subject: [PATCH 020/311] ruler: format with nixfmt --- pkgs/tools/security/ruler/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/tools/security/ruler/default.nix index 94fa0a83424b..fe63a7307280 100644 --- a/pkgs/tools/security/ruler/default.nix +++ b/pkgs/tools/security/ruler/default.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { From 064f4c55c0fa81a38839878adeef390548661cac Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 17 May 2024 10:13:13 +0200 Subject: [PATCH 021/311] doc: migrate lib.fixedPoints to doc-comment format --- lib/fixed-points.nix | 152 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 120 insertions(+), 32 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 3bd18fdd2a5a..2a31b44f27c1 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -1,6 +1,6 @@ { lib, ... }: rec { - /* + /** `fix f` computes the fixed point of the given function `f`. In other words, the return value is `x` in `x = f x`. `f` must be a lazy function. @@ -63,27 +63,52 @@ rec { See [`extends`](#function-library-lib.fixedPoints.extends) for an example use case. There `self` is also often called `final`. - Type: fix :: (a -> a) -> a - Example: - fix (self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }) - => { bar = "bar"; foo = "foo"; foobar = "foobar"; } + # Inputs - fix (self: [ 1 2 (elemAt self 0 + elemAt self 1) ]) - => [ 1 2 3 ] + `f` + + : 1\. Function argument + + # Type + + ``` + fix :: (a -> a) -> a + ``` + + # Examples + :::{.example} + ## `lib.fixedPoints.fix` usage example + + ```nix + fix (self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }) + => { bar = "bar"; foo = "foo"; foobar = "foobar"; } + + fix (self: [ 1 2 (elemAt self 0 + elemAt self 1) ]) + => [ 1 2 3 ] + ``` + + ::: */ fix = f: let x = f x; in x; - /* + /** A variant of `fix` that records the original recursive attribute set in the result, in an attribute named `__unfix__`. This is useful in combination with the `extends` function to implement deep overriding. + + + # Inputs + + `f` + + : 1\. Function argument */ fix' = f: let x = f x // { __unfix__ = f; }; in x; - /* + /** Return the fixpoint that `f` converges to when called iteratively, starting with the input `x`. @@ -92,7 +117,22 @@ rec { 0 ``` - Type: (a -> a) -> a -> a + + # Inputs + + `f` + + : 1\. Function argument + + `x` + + : 2\. Function argument + + # Type + + ``` + (a -> a) -> a -> a + ``` */ converge = f: x: let @@ -102,7 +142,7 @@ rec { then x else converge f x'; - /* + /** Extend a function using an overlay. Overlays allow modifying and extending fixed-point functions, specifically ones returning attribute sets. @@ -217,32 +257,50 @@ rec { ``` ::: - Type: - extends :: (Attrs -> Attrs -> Attrs) # The overlay to apply to the fixed-point function - -> (Attrs -> Attrs) # A fixed-point function - -> (Attrs -> Attrs) # The resulting fixed-point function - Example: - f = final: { a = 1; b = final.a + 2; } + # Inputs - fix f - => { a = 1; b = 3; } + `overlay` - fix (extends (final: prev: { a = prev.a + 10; }) f) - => { a = 11; b = 13; } + : The overlay to apply to the fixed-point function - fix (extends (final: prev: { b = final.a + 5; }) f) - => { a = 1; b = 6; } + `f` - fix (extends (final: prev: { c = final.a + final.b; }) f) - => { a = 1; b = 3; c = 4; } + : The fixed-point function + + # Type + + ``` + extends :: (Attrs -> Attrs -> Attrs) # The overlay to apply to the fixed-point function + -> (Attrs -> Attrs) # A fixed-point function + -> (Attrs -> Attrs) # The resulting fixed-point function + ``` + + # Examples + :::{.example} + ## `lib.fixedPoints.extends` usage example + + ```nix + f = final: { a = 1; b = final.a + 2; } + + fix f + => { a = 1; b = 3; } + + fix (extends (final: prev: { a = prev.a + 10; }) f) + => { a = 11; b = 13; } + + fix (extends (final: prev: { b = final.a + 5; }) f) + => { a = 1; b = 6; } + + fix (extends (final: prev: { c = final.a + final.b; }) f) + => { a = 1; b = 3; c = 4; } + ``` + + ::: */ extends = - # The overlay to apply to the fixed-point function overlay: - # The fixed-point function f: - # Wrap with parenthesis to prevent nixdoc from rendering the `final` argument in the documentation # The result should be thought of as a function, the argument of that function is not an argument to `extends` itself ( final: @@ -252,10 +310,29 @@ rec { prev // overlay final prev ); - /* + /** Compose two extending functions of the type expected by 'extends' into one where changes made in the first are available in the 'super' of the second + + + # Inputs + + `f` + + : 1\. Function argument + + `g` + + : 2\. Function argument + + `final` + + : 3\. Function argument + + `prev` + + : 4\. Function argument */ composeExtensions = f: g: final: prev: @@ -263,7 +340,7 @@ rec { prev' = prev // fApplied; in fApplied // g final prev'; - /* + /** Compose several extending functions of the type expected by 'extends' into one where changes made in preceding functions are made available to subsequent ones. @@ -276,7 +353,7 @@ rec { composeManyExtensions = lib.foldr (x: y: composeExtensions x y) (final: prev: {}); - /* + /** Create an overridable, recursive attribute set. For example: ``` @@ -298,9 +375,20 @@ rec { */ makeExtensible = makeExtensibleWithCustomName "extend"; - /* + /** Same as `makeExtensible` but the name of the extending attribute is customized. + + + # Inputs + + `extenderName` + + : 1\. Function argument + + `rattrs` + + : 2\. Function argument */ makeExtensibleWithCustomName = extenderName: rattrs: fix' (self: (rattrs self) // { From b258b44a5d0f2c68838eb631fd142f6ac7513d1e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 17 May 2024 10:17:28 +0200 Subject: [PATCH 022/311] build-support/php: add `composerGlobal` variable This doesn't change anything to the existing workflow --- .../php/builders/v1/hooks/php-script-utils.bash | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash index bba0242e65d1..65c0a3b410f6 100644 --- a/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash @@ -1,5 +1,6 @@ declare version declare composerStrictValidation +declare composerGlobal setComposeRootVersion() { set +e # Disable exit on error @@ -13,7 +14,16 @@ setComposeRootVersion() { } checkComposerValidate() { - if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --no-check-lock; then + setComposeRootVersion + + if [ "1" == "${composerGlobal-}" ]; then + global="global"; + else + global=""; + fi + + command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock" + if ! $command; then if [ "1" == "${composerStrictValidation-}" ]; then echo echo -e "\e[31mERROR: composer files validation failed\e[0m" @@ -42,7 +52,8 @@ checkComposerValidate() { fi fi - if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock; then + command="composer ${global} validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock" + if ! $command; then if [ "1" == "${composerStrictValidation-}" ]; then echo echo -e "\e[31mERROR: composer files validation failed\e[0m" From 7415f9eccf7c113b548a1a4bfc6935c56ce5ff0a Mon Sep 17 00:00:00 2001 From: Jono Chang Date: Fri, 17 May 2024 20:12:36 +1000 Subject: [PATCH 023/311] maintainers: add jonochang --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6755910f1a8f..573fbaa0935e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9924,6 +9924,12 @@ githubId = 8580434; name = "Jonny Bolton"; }; + jonochang = { + name = "Jono Chang"; + email = "j.g.chang@gmail.com"; + github = "jonochang"; + githubId = 13179; + }; jonringer = { email = "jonringer117@gmail.com"; matrix = "@jonringer:matrix.org"; From 010c4a334eaf96112bc812bd4ed70818376b889a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 May 2024 00:27:17 +0000 Subject: [PATCH 024/311] intune-portal: 1.2404.23-jammy -> 1.2404.25-jammy --- pkgs/by-name/in/intune-portal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index c51771824446..48b945c833c3 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2404.23-jammy"; + version = "1.2404.25-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-zAH35iF+3YpDNGo3UhmzL4pRJXlEhG1PaT71qnRtpAg="; + hash = "sha256-ZRJdhhDwXeOjIx7Ml4VvPUOotnJQ9f73nsYzgm6SQC8="; }; nativeBuildInputs = [ dpkg ]; From 4488f0a15ce3ebf18f2c4015a97372faa38410fc Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 17 May 2024 20:17:17 +0200 Subject: [PATCH 025/311] nitrokey-app2: 2.2.2 -> 2.3.0, unpin pynitrokey https://github.com/Nitrokey/nitrokey-app2/releases/tag/v2.3.0 --- pkgs/tools/security/nitrokey-app2/default.nix | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index 8e97ce02af4c..5477a603d4af 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,49 +1,27 @@ { lib , stdenv , python3 -, fetchPypi , fetchFromGitHub , wrapQtAppsHook , qtbase , qtwayland }: -let - python = python3.override { - packageOverrides = self: super: { - pynitrokey = super.pynitrokey.overridePythonAttrs (old: rec { - version = "0.4.45"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-iY4ThrmXP7pEjTYYU4lePVAbuJGTdHX3iKswXzuf7W8="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; - version = "2.2.2"; + version = "2.3.0"; pyproject = true; - disabled = python.pythonOlder "3.9"; + disabled = python3.pythonOlder "3.9"; src = fetchFromGitHub { owner = "Nitrokey"; repo = "nitrokey-app2"; rev = "v${version}"; - hash = "sha256-MiyfmsrKZRoe7YMEjR1LHPesfJh6+dcSydoEAgrALJ8="; + hash = "sha256-BSq3ezNt6btQUO1hMVw9bN3VCyUOUhfRFJcHDGkIm6Q="; }; - # https://github.com/Nitrokey/nitrokey-app2/issues/152 - # - # pythonRelaxDepsHook does not work here, because it runs in postBuild and - # only modifies the dependencies in the built distribution. - postPatch = '' - substituteInPlace pyproject.toml --replace 'pynitrokey = "' 'pynitrokey = ">=' - ''; - - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ poetry-core wrapQtAppsHook ]; @@ -52,7 +30,7 @@ in python.pkgs.buildPythonApplication rec { qtwayland ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ pynitrokey pyudev pyside6 From 557aac6e99a64664575448fe91c830ac14d5d3d4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 19 May 2024 09:10:42 -0400 Subject: [PATCH 026/311] waylock: move to by-name --- .../misc/waylock/default.nix => by-name/wa/waylock/package.nix} | 0 pkgs/{applications/misc => by-name/wa}/waylock/update.nu | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc/waylock/default.nix => by-name/wa/waylock/package.nix} (100%) rename pkgs/{applications/misc => by-name/wa}/waylock/update.nu (100%) diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/by-name/wa/waylock/package.nix similarity index 100% rename from pkgs/applications/misc/waylock/default.nix rename to pkgs/by-name/wa/waylock/package.nix diff --git a/pkgs/applications/misc/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu similarity index 100% rename from pkgs/applications/misc/waylock/update.nu rename to pkgs/by-name/wa/waylock/update.nu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f800aaa51d77..359735fa16f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31719,8 +31719,6 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; From 903403da6d19d7bad3f7a5e9544c84050ed268f0 Mon Sep 17 00:00:00 2001 From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com> Date: Sun, 19 May 2024 22:10:17 +0300 Subject: [PATCH 027/311] neovim-unwrapped: remove unused dependencies --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index eaf637c88e64..e3faa79f0514 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libtermkey, libiconv -, libuv, lua, ncurses, pkg-config -, unibilium, gperf +{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libiconv +, libuv, lua, pkg-config +, unibilium , libvterm-neovim , tree-sitter , fetchurl @@ -93,8 +93,6 @@ in { ; buildInputs = [ - gperf - libtermkey libuv libvterm-neovim # This is actually a c library, hence it's not included in neovimLuaEnv, @@ -103,7 +101,6 @@ in { # and it's definition at: pkgs/development/lua-modules/overrides.nix lua.pkgs.libluv msgpack-c - ncurses neovimLuaEnv tree-sitter unibilium From f3f8d8d2133a997b2236ff8817adf3e8b2e02ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 19:57:03 +0000 Subject: [PATCH 028/311] devpod: 0.5.4 -> 0.5.7 --- pkgs/development/tools/devpod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 6b66869828d1..0f006fca5c92 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BXr+2uia5skNRpdo8T+0uOVdh6WmWeC42PGNSURJhas="; + sha256 = "sha256-h7FT8Mp/JOOf3XoAJDl1tBKoLfOAS7oaacirPZRQr6A="; }; meta = with lib; { From bd92bef332afec55f2871c21a875e5d3c0fbe6d4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 16 May 2024 14:31:09 +0200 Subject: [PATCH 029/311] php.buildComposerWithPlugin: init new builder --- pkgs/build-support/php/builders/default.nix | 1 + .../v1/build-composer-with-plugin.nix | 161 ++++++++++++++++++ .../hooks/composer-with-plugin-vendor-hook.sh | 93 ++++++++++ .../php/builders/v1/hooks/default.nix | 15 ++ pkgs/development/interpreters/php/generic.nix | 2 +- pkgs/top-level/php-packages.nix | 2 +- 6 files changed, 272 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix create mode 100644 pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh diff --git a/pkgs/build-support/php/builders/default.nix b/pkgs/build-support/php/builders/default.nix index 209c834367d1..ea9bb3350435 100644 --- a/pkgs/build-support/php/builders/default.nix +++ b/pkgs/build-support/php/builders/default.nix @@ -2,6 +2,7 @@ { v1 = { buildComposerProject = callPackage ./v1/build-composer-project.nix { }; + buildComposerWithPlugin = callPackage ./v1/build-composer-with-plugin.nix { }; mkComposerRepository = callPackage ./v1/build-composer-repository.nix { }; composerHooks = callPackages ./v1/hooks { }; }; diff --git a/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix new file mode 100644 index 000000000000..060b51241e6c --- /dev/null +++ b/pkgs/build-support/php/builders/v1/build-composer-with-plugin.nix @@ -0,0 +1,161 @@ +{ + stdenvNoCC, + writeText, + lib, + makeBinaryWrapper, + php, + cacert, + nix-update-script, +}: + +let + composerJsonBuilder = + pluginName: pluginVersion: + writeText "composer.json" ( + builtins.toJSON { + name = "nix/plugin"; + description = "Nix Composer plugin"; + license = "MIT"; + require = { + "${pluginName}" = "${pluginVersion}"; + }; + config = { + "allow-plugins" = { + "${pluginName}" = true; + }; + }; + repositories = [ + { + type = "path"; + url = "./src"; + options = { + versions = { + "${pluginName}" = "${pluginVersion}"; + }; + }; + } + ]; + } + ); + + buildComposerWithPluginOverride = + finalAttrs: previousAttrs: + + let + phpDrv = finalAttrs.php or php; + composer = finalAttrs.composer or phpDrv.packages.composer; + in + { + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + composerGlobal = true; + + nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ + composer + phpDrv + makeBinaryWrapper + ]; + + buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ]; + + patches = previousAttrs.patches or [ ]; + strictDeps = previousAttrs.strictDeps or true; + + # Should we keep these empty phases? + configurePhase = + previousAttrs.configurePhase or '' + runHook preConfigure + + runHook postConfigure + ''; + + buildPhase = + previousAttrs.buildPhase or '' + runHook preBuild + + runHook postBuild + ''; + + doCheck = previousAttrs.doCheck or true; + + checkPhase = + previousAttrs.checkPhase or '' + runHook preCheck + + runHook postCheck + ''; + + installPhase = + previousAttrs.installPhase or '' + runHook preInstall + + makeWrapper ${lib.getExe composer} $out/bin/composer \ + --prefix COMPOSER_HOME : ${finalAttrs.vendor} + + runHook postInstall + ''; + + doInstallCheck = previousAttrs.doInstallCheck or false; + installCheckPhase = + previousAttrs.installCheckPhase or '' + runHook preInstallCheck + + composer global show ${finalAttrs.pname} + + runHook postInstallCheck + ''; + + vendor = previousAttrs.vendor or stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-vendor"; + pluginName = finalAttrs.pname; + + inherit (finalAttrs) version src; + + composerLock = previousAttrs.composerLock or null; + composerNoDev = previousAttrs.composerNoDev or true; + composerNoPlugins = previousAttrs.composerNoPlugins or true; + composerNoScripts = previousAttrs.composerNoScripts or true; + composerStrictValidation = previousAttrs.composerStrictValidation or true; + composerGlobal = true; + composerJson = composerJsonBuilder finalAttrs.pname finalAttrs.version; + + nativeBuildInputs = [ + cacert + composer + phpDrv.composerHooks.composerWithPluginVendorHook + ]; + + dontPatchShebangs = true; + doCheck = true; + doInstallCheck = true; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_HTACCESS_PROTECT = "0"; + }; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = finalAttrs.vendorHash; + }; + + # Projects providing a lockfile from upstream can be automatically updated. + passthru = previousAttrs.passthru or { } // { + updateScript = + previousAttrs.passthru.updateScript + or (if finalAttrs.vendor.composerLock == null then nix-update-script { } else null); + }; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "1"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + }; + + meta = previousAttrs.meta or composer.meta; + }; +in +args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerWithPluginOverride diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh new file mode 100644 index 000000000000..0d88d14094ad --- /dev/null +++ b/pkgs/build-support/php/builders/v1/hooks/composer-with-plugin-vendor-hook.sh @@ -0,0 +1,93 @@ +declare composerLock +declare version +declare composerNoDev +declare composerNoPlugins +declare composerNoScripts +declare composerStrictValidation + +preConfigureHooks+=(composerWithPluginConfigureHook) +preBuildHooks+=(composerWithPluginBuildHook) +preCheckHooks+=(composerWithPluginCheckHook) +preInstallHooks+=(composerWithPluginInstallHook) +preInstallCheckHooks+=(composerWithPluginInstallCheckHook) + +source @phpScriptUtils@ + +composerWithPluginConfigureHook() { + echo "Executing composerWithPluginConfigureHook" + + mkdir -p $out + + export COMPOSER_HOME=$out + + if [[ -e "$composerLock" ]]; then + cp $composerLock $out/composer.lock + fi + + cp $composerJson $out/composer.json + cp -ar $src $out/src + + if [[ ! -f "$out/composer.lock" ]]; then + setComposeRootVersion + + composer \ + global \ + --no-install \ + --no-interaction \ + --no-progress \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + update + + echo + echo -e "\e[31mERROR: No composer.lock found\e[0m" + echo + echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m' + echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m" + echo + echo -e '\e[31mTo fix the issue:\e[0m' + echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m" + echo -e "\e[31m cp $out/composer.lock \e[0m" + echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m' + echo -e '\e[31m composerLock = ./composer.lock;\e[0m' + echo + + exit 1 + fi + + echo "Finished composerWithPluginConfigureHook" +} + +composerWithPluginBuildHook() { + echo "Executing composerWithPluginBuildHook" + + echo "Finished composerWithPluginBuildHook" +} + +composerWithPluginCheckHook() { + echo "Executing composerWithPluginCheckHook" + + checkComposerValidate + + echo "Finished composerWithPluginCheckHook" +} + +composerWithPluginInstallHook() { + echo "Executing composerWithPluginInstallHook" + + composer \ + global \ + --no-interaction \ + --no-progress \ + ${composerNoDev:+--no-dev} \ + ${composerNoPlugins:+--no-plugins} \ + ${composerNoScripts:+--no-scripts} \ + install + + echo "Finished composerWithPluginInstallHook" +} + +composerWithPluginInstallCheckHook() { + composer global show $pluginName +} diff --git a/pkgs/build-support/php/builders/v1/hooks/default.nix b/pkgs/build-support/php/builders/v1/hooks/default.nix index 4c0ba1b18801..d10ff7806727 100644 --- a/pkgs/build-support/php/builders/v1/hooks/default.nix +++ b/pkgs/build-support/php/builders/v1/hooks/default.nix @@ -42,4 +42,19 @@ in phpScriptUtils = lib.getExe php-script-utils; }; } ./composer-install-hook.sh; + + composerWithPluginVendorHook = makeSetupHook { + name = "composer-with-plugin-vendor-hook.sh"; + propagatedBuildInputs = [ + jq + moreutils + cacert + ]; + substitutions = { + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; + }; + } ./composer-with-plugin-vendor-hook.sh; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 68ca8e4d3bba..b2e07d927681 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -164,7 +164,7 @@ let nixos = lib.recurseIntoAttrs nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; package = tests.php; }; - inherit (php-packages) extensions buildPecl mkComposerRepository buildComposerProject composerHooks mkExtension; + inherit (php-packages) extensions buildPecl mkComposerRepository buildComposerProject buildComposerWithPlugin composerHooks mkExtension; packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6a5e16185601..9f2da185bc2c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,7 +57,7 @@ in { php = php.unwrapped; }; - inherit (builders.v1) buildComposerProject composerHooks mkComposerRepository; + inherit (builders.v1) buildComposerProject buildComposerWithPlugin composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. From d503bc4f4a20f137a253d4575e2d32ab7c013f8d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 16 May 2024 15:02:16 +0200 Subject: [PATCH 030/311] php.packages.composer-local-repo-plugin: init at 1.1.0 --- .../composer-local-repo-plugin/composer.lock | 72 +++++++++++++++++++ .../composer-local-repo-plugin/default.nix | 33 +++++++++ pkgs/top-level/php-packages.nix | 2 + 3 files changed, 107 insertions(+) create mode 100644 pkgs/development/php-packages/composer-local-repo-plugin/composer.lock create mode 100644 pkgs/development/php-packages/composer-local-repo-plugin/default.nix diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/composer.lock b/pkgs/development/php-packages/composer-local-repo-plugin/composer.lock new file mode 100644 index 000000000000..1cd1d3b233cd --- /dev/null +++ b/pkgs/development/php-packages/composer-local-repo-plugin/composer.lock @@ -0,0 +1,72 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "04664aa86ba468bc6c83825839823dd7", + "packages": [ + { + "name": "nix-community/composer-local-repo-plugin", + "version": "1.1.0", + "dist": { + "type": "path", + "url": "./src", + "reference": "56bd0f1fb990aa295ca43fc23141b7147a3b5490" + }, + "require": { + "composer-plugin-api": "^2", + "php": ">= 7.2" + }, + "require-dev": { + "composer/composer": "^2.6 || ^2.7", + "phpunit/phpunit": "^8" + }, + "type": "composer-plugin", + "extra": { + "class": "NixCommunity\\ComposerLocalRepoPlugin\\Plugin" + }, + "autoload": { + "psr-4": { + "NixCommunity\\ComposerLocalRepoPlugin\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "test\\NixCommunity\\ComposerLocalRepoPlugin\\": "test" + } + }, + "scripts": { + "changelog-unreleased": [ + "auto-changelog -c .auto-changelog -u" + ], + "changelog-version": [ + "auto-changelog -c .auto-changelog -v" + ] + }, + "license": [ + "MIT" + ], + "description": "A plugin for Composer which provides a command to create local Composer repository for your projects.", + "homepage": "https://github.com/nix-community/composer-local-repo-plugin", + "funding": [ + { + "type": "github", + "url": "https://github.com/drupol" + } + ], + "transport-options": { + "relative": true + } + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/composer-local-repo-plugin/default.nix b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix new file mode 100644 index 000000000000..d6199a568659 --- /dev/null +++ b/pkgs/development/php-packages/composer-local-repo-plugin/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + php, +}: + +let + version = "1.1.0"; +in +php.buildComposerWithPlugin { + pname = "nix-community/composer-local-repo-plugin"; + inherit version; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "composer-local-repo-plugin"; + rev = version; + hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M="; + }; + + composerLock = ./composer.lock; + vendorHash = "sha256-SL3HiYTVaUwcEfnRO932MWgOP1VRkxTl3lxLbW0qiTY="; + + meta = { + changelog = "https://github.com/nix-community/composer-local-repo-plugin/releases/tag/${version}"; + description = "Composer plugin that facilitates the creation of a local composer type repository"; + homepage = "https://github.com/nix-community/composer-local-repo-plugin"; + license = lib.licenses.mit; + mainProgram = "composer"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9f2da185bc2c..4a2f5005973b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -191,6 +191,8 @@ in { composer = callPackage ../development/php-packages/composer { }; + composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { }; + deployer = callPackage ../development/php-packages/deployer { }; grumphp = callPackage ../development/php-packages/grumphp { }; From 6bad2e219e75bac3e5b3f3959c07cb20894b5d51 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 16 May 2024 15:11:09 +0200 Subject: [PATCH 031/311] build-support/php: use `php.packages.composer-local-repo-plugin` --- .../builders/v1/build-composer-project.nix | 7 +- .../builders/v1/build-composer-repository.nix | 5 +- .../v1/hooks/composer-install-hook.sh | 2 +- .../v1/hooks/composer-repository-hook.sh | 2 +- .../php/pkgs/composer-local-repo-plugin.nix | 116 ------------------ 5 files changed, 5 insertions(+), 127 deletions(-) delete mode 100644 pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix diff --git a/pkgs/build-support/php/builders/v1/build-composer-project.nix b/pkgs/build-support/php/builders/v1/build-composer-project.nix index 7e24812d2e76..698391ad1603 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-project.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-project.nix @@ -1,5 +1,4 @@ { - callPackage, nix-update-script, stdenvNoCC, lib, @@ -12,8 +11,7 @@ let let phpDrv = finalAttrs.php or php; - composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; + composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; in { composerLock = previousAttrs.composerLock or null; @@ -24,7 +22,6 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer - composer-local-repo-plugin phpDrv phpDrv.composerHooks.composerInstallHook ]; @@ -74,7 +71,7 @@ let composerRepository = previousAttrs.composerRepository or (phpDrv.mkComposerRepository { - inherit composer composer-local-repo-plugin; + inherit composer; inherit (finalAttrs) patches pname diff --git a/pkgs/build-support/php/builders/v1/build-composer-repository.nix b/pkgs/build-support/php/builders/v1/build-composer-repository.nix index 54944b91d202..037d8bdeb3eb 100644 --- a/pkgs/build-support/php/builders/v1/build-composer-repository.nix +++ b/pkgs/build-support/php/builders/v1/build-composer-repository.nix @@ -1,5 +1,4 @@ { - callPackage, stdenvNoCC, lib, php, @@ -23,8 +22,7 @@ let let phpDrv = finalAttrs.php or php; - composer = finalAttrs.composer or phpDrv.packages.composer; - composer-local-repo-plugin = callPackage ../../pkgs/composer-local-repo-plugin.nix { }; + composer = finalAttrs.composer or phpDrv.packages.composer-local-repo-plugin; in assert (lib.assertMsg (previousAttrs ? src) "mkComposerRepository expects src argument."); assert ( @@ -58,7 +56,6 @@ let nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ composer - composer-local-repo-plugin phpDrv phpDrv.composerHooks.composerRepositoryHook ]; diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh index a91263422bc8..44e87d06d3a5 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-install-hook.sh @@ -83,7 +83,7 @@ composerInstallBuildHook() { # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. - composer-local-repo-plugin --no-ansi build-local-repo-lock -m "${composerRepository}" . + composer build-local-repo-lock -m "${composerRepository}" . echo "Finished composerInstallBuildHook" } diff --git a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh index c4fa0d52126c..ec9777541fc0 100644 --- a/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/builders/v1/hooks/composer-repository-hook.sh @@ -63,7 +63,7 @@ composerRepositoryBuildHook() { # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin # nix-community/composer-local-repo-plugin. - composer-local-repo-plugin --no-ansi build-local-repo-lock ${composerNoDev:+--no-dev} -r repository + composer build-local-repo-lock ${composerNoDev:+--no-dev} -r repository echo "Finished composerRepositoryBuildHook" } diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix deleted file mode 100644 index 601640b6f0bb..000000000000 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ - php, - callPackage, - stdenvNoCC, - lib, - fetchFromGitHub, - makeBinaryWrapper, -}: - -let - composer = callPackage ./composer-phar.nix { inherit (php.packages.composer) version pharHash; }; - - composerKeys = stdenvNoCC.mkDerivation (finalComposerKeysAttrs: { - pname = "composer-keys"; - version = "fa5a62092f33e094073fbda23bbfc7188df3cbc5"; - - src = fetchFromGitHub { - owner = "composer"; - repo = "composer.github.io"; - rev = "${finalComposerKeysAttrs.version}"; - hash = "sha256-3Sfn71LDG1jHwuEIU8iEnV3k6D6QTX7KVIKVaNSuCVE="; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out - install releases.pub $out/keys.tags.pub - install snapshots.pub $out/keys.dev.pub - - runHook postInstall - ''; - }); -in -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "composer-local-repo-plugin"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "composer-local-repo-plugin"; - rev = finalAttrs.version; - hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M="; - }; - - env = { - COMPOSER_CACHE_DIR = "/dev/null"; - COMPOSER_MIRROR_PATH_REPOS = "1"; - COMPOSER_HTACCESS_PROTECT = "0"; - COMPOSER_DISABLE_NETWORK = "1"; - }; - - nativeBuildInputs = [ makeBinaryWrapper ]; - - buildInputs = [ composer ]; - - configurePhase = '' - runHook preConfigure - - export COMPOSER_HOME=${placeholder "out"} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - # Configure composer globally - composer global init --quiet --no-interaction --no-ansi \ - --name="nixos/composer" \ - --homepage "https://nixos.org/" \ - --description "Composer with nix-community/composer-local-repo-plugin" \ - --license "MIT" - - composer global config --quiet minimum-stability dev - composer global config --quiet prefer-stable true - composer global config --quiet apcu-autoloader false - composer global config --quiet allow-plugins.nix-community/composer-local-repo-plugin true - composer global config --quiet repo.packagist false - composer global config --quiet repo.plugin path $src - - # Install the local repository plugin - composer global require --quiet --no-ansi --no-interaction nix-community/composer-local-repo-plugin - - runHook postBuild - ''; - - checkPhase = '' - runHook preCheck - - composer global validate --no-ansi - composer global show --no-ansi nix-community/composer-local-repo-plugin - - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -ar ${composerKeys}/* $out/ - - makeWrapper ${composer}/bin/composer $out/bin/composer-local-repo-plugin \ - --prefix COMPOSER_HOME : $out - - runHook postInstall - ''; - - meta = { - description = "Composer local repo plugin for Composer"; - homepage = "https://github.com/nix-community/composer-local-repo-plugin"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.platforms.all; - }; -}) From 450e9396fd52fe309f4e7ba42a3eecea316f3091 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 16 May 2024 16:44:22 +0200 Subject: [PATCH 032/311] php.packages.composer: do not use `buildComposerProject` I decided to avoid the use of `buildComposerProject because it requires `composer-local-repo-plugin` which is going to be refactored. --- pkgs/build-support/php/pkgs/composer-phar.nix | 2 - .../php-packages/composer/default.nix | 76 ++++++++++++++++--- 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/php/pkgs/composer-phar.nix b/pkgs/build-support/php/pkgs/composer-phar.nix index d278810091ef..b07c25beec55 100644 --- a/pkgs/build-support/php/pkgs/composer-phar.nix +++ b/pkgs/build-support/php/pkgs/composer-phar.nix @@ -1,6 +1,5 @@ { _7zz, - cacert, curl, fetchurl, git, @@ -37,7 +36,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ _7zz - cacert curl git unzip diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index d98c3155bb91..d8bfca7c348f 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,7 +1,8 @@ { lib, - callPackage, + stdenvNoCC, fetchFromGitHub, + callPackage, php, unzip, _7zz, @@ -12,7 +13,10 @@ makeBinaryWrapper, }: -php.buildComposerProject (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "composer"; + version = "2.7.6"; + # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer @@ -24,9 +28,6 @@ php.buildComposerProject (finalAttrs: { inherit (finalAttrs.passthru) pharHash; }; - pname = "composer"; - version = "2.7.6"; - src = fetchFromGitHub { owner = "composer"; repo = "composer"; @@ -36,21 +37,78 @@ php.buildComposerProject (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper ]; - postInstall = '' + buildInputs = [ php ]; + + vendor = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-vendor"; + + inherit (finalAttrs) src version; + + nativeBuildInputs = [ + cacert + finalAttrs.composer + ]; + + dontPatchShebangs = true; + doCheck = true; + + buildPhase = '' + runHook preBuild + + composer install --no-dev --no-interaction --no-progress --optimize-autoloader + + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + + composer validate + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + cp -ar . $out/ + + runHook postInstall + ''; + + env = { + COMPOSER_CACHE_DIR = "/dev/null"; + COMPOSER_DISABLE_NETWORK = "0"; + COMPOSER_HTACCESS_PROTECT = "0"; + COMPOSER_MIRROR_PATH_REPOS = "1"; + COMPOSER_ROOT_VERSION = finalAttrs.version; + }; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-AyX57oV5Jf8U4B9tEl+b2Rnt/Igu7ockEap0wfN9b2Q="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -ar ${finalAttrs.vendor}/* $out/ + chmod +w $out/bin + wrapProgram $out/bin/composer \ --prefix PATH : ${ lib.makeBinPath [ _7zz - cacert curl git unzip xz ] } - ''; - vendorHash = "sha256-dNNV9fTyGyRoGeDV/vBjn0aMgkaUMsrKQv5AOoiYokQ="; + runHook postInstall + ''; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; From c99246f169aa2ae68a483a86d733a7645ad44089 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 16 May 2024 14:33:50 +0200 Subject: [PATCH 033/311] php.packages.cyclonedx-php-composer: init at 5.2.0 --- .../cyclonedx-php-composer/composer.lock | 571 ++++++++++++++++++ .../cyclonedx-php-composer/default.nix | 33 + pkgs/top-level/php-packages.nix | 2 + 3 files changed, 606 insertions(+) create mode 100644 pkgs/development/php-packages/cyclonedx-php-composer/composer.lock create mode 100644 pkgs/development/php-packages/cyclonedx-php-composer/default.nix diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/composer.lock b/pkgs/development/php-packages/cyclonedx-php-composer/composer.lock new file mode 100644 index 000000000000..d57ce5b100d0 --- /dev/null +++ b/pkgs/development/php-packages/cyclonedx-php-composer/composer.lock @@ -0,0 +1,571 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "c949500f008befd2980bd7f80454c43b", + "packages": [ + { + "name": "composer/spdx-licenses", + "version": "1.5.8", + "source": { + "type": "git", + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "reference": "560bdcf8deb88ae5d611c80a2de8ea9d0358cc0a", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Spdx\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "SPDX licenses list and validation library.", + "keywords": [ + "license", + "spdx", + "validator" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/spdx-licenses/issues", + "source": "https://github.com/composer/spdx-licenses/tree/1.5.8" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-11-20T07:44:33+00:00" + }, + { + "name": "cyclonedx/cyclonedx-library", + "version": "v3.3.1", + "source": { + "type": "git", + "url": "https://github.com/CycloneDX/cyclonedx-php-library.git", + "reference": "cad0f92b36c85f36b3d3c11ff96002af5f20cd10" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CycloneDX/cyclonedx-php-library/zipball/cad0f92b36c85f36b3d3c11ff96002af5f20cd10", + "reference": "cad0f92b36c85f36b3d3c11ff96002af5f20cd10", + "shasum": "" + }, + "require": { + "composer/spdx-licenses": "^1.5", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "opis/json-schema": "^2.0", + "package-url/packageurl-php": "^1.0", + "php": "^8.1" + }, + "require-dev": { + "ext-simplexml": "*", + "roave/security-advisories": "dev-latest" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + }, + "composer-normalize": { + "indent-size": 4, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "CycloneDX\\Core\\": "src/Core/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Jan Kowalleck", + "email": "jan.kowalleck@gmail.com", + "homepage": "https://github.com/jkowalleck" + } + ], + "description": "Work with CycloneDX documents.", + "homepage": "https://github.com/CycloneDX/cyclonedx-php-library/#readme", + "keywords": [ + "CycloneDX", + "HBOM", + "OBOM", + "SBOM", + "SaaSBOM", + "bill-of-materials", + "bom", + "models", + "normalizer", + "owasp", + "package-url", + "purl", + "serializer", + "software-bill-of-materials", + "spdx", + "validator", + "vdr", + "vex" + ], + "support": { + "docs": "https://cyclonedx-php-library.readthedocs.io", + "issues": "https://github.com/CycloneDX/cyclonedx-php-library/issues", + "source": "https://github.com/CycloneDX/cyclonedx-php-library/" + }, + "funding": [ + { + "url": "https://owasp.org/donate/?reponame=www-project-cyclonedx&title=OWASP+CycloneDX", + "type": "other" + } + ], + "time": "2024-05-06T13:34:55+00:00" + }, + { + "name": "cyclonedx/cyclonedx-php-composer", + "version": "5.2.0", + "dist": { + "type": "path", + "url": "./src", + "reference": "88ae6a60b882d72668d409b0d4fcc9bfa0c66259" + }, + "require": { + "composer-plugin-api": "^2.3", + "cyclonedx/cyclonedx-library": "^3.3", + "package-url/packageurl-php": "^1.0", + "php": "^8.1" + }, + "require-dev": { + "composer/composer": "^2.3.0", + "roave/security-advisories": "dev-latest" + }, + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + }, + "class": "CycloneDX\\Composer\\Plugin", + "composer-normalize": { + "indent-size": 4, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "CycloneDX\\Composer\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "CycloneDX\\Tests\\": "tests/" + } + }, + "scripts": { + "clean": [ + "rm -rf reports", + "@php tools/psalm/vendor/vimeo/psalm/psalm --clear-cache", + "@php tools/psalm/vendor/vimeo/psalm/psalm --clear-global-cache", + "rm -rf .*.cache", + "rm -rf .tmp" + ], + "cs-fix": [ + "@php tools/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --diff" + ], + "dev-setup": [ + "@composer -d tools/composer-normalize update", + "@composer -d tools/composer-require-checker update", + "@composer -d tools/composer-unused update", + "@composer -d tools/php-cs-fixer update", + "@composer -d tools/psalm update", + "@composer -d tools/phpunit update", + "@composer update" + ], + "normalize": [ + "@composer -d tools/composer-normalize normalize --diff $PWD/composer.json" + ], + "test": [ + "@composer validate", + "@test:psalm", + "@test:phpunit", + "@test:cs-fixer", + "@test:composer-unused", + "@test:composer-require-checker", + "@test:composer-normalize" + ], + "test:composer-normalize": [ + "@composer -d tools/composer-normalize normalize --dry-run $PWD/composer.json" + ], + "test:composer-require-checker": [ + "@putenv XDEBUG_MODE=off", + "@php tools/composer-require-checker/vendor/maglnet/composer-require-checker/bin/composer-require-checker check" + ], + "test:composer-unused": [ + "@php tools/composer-unused/vendor/icanhazstring/composer-unused/bin/composer-unused --excludeDir=tools" + ], + "test:cs-fixer": [ + "@php tools/php-cs-fixer/vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff" + ], + "test:phpunit": [ + "@php -d zend.assertions=1 -d assert.exception=1 -d display_errors=On -d error_reporting=-1 -d log_errors_max_len=0 -d memory_limit=-1 tools/phpunit/vendor/phpunit/phpunit/phpunit" + ], + "test:psalm": [ + "@php tools/psalm/vendor/vimeo/psalm/psalm" + ] + }, + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Jan Kowalleck", + "email": "jan.kowalleck@gmail.com", + "homepage": "https://github.com/jkowalleck" + } + ], + "description": "Creates CycloneDX Software Bill-of-Materials (SBOM) from PHP Composer projects", + "homepage": "https://github.com/CycloneDX/cyclonedx-php-composer/#readme", + "keywords": [ + "BOM", + "CycloneDX", + "PURL", + "SBOM", + "SPDX", + "bill-of-materials", + "composer", + "package-url", + "software-bill-of-materials" + ], + "support": { + "issues": "https://github.com/CycloneDX/cyclonedx-php-composer/issues", + "source": "https://github.com/CycloneDX/cyclonedx-php-composer/" + }, + "funding": [ + { + "type": "other", + "url": "https://owasp.org/donate/?reponame=www-project-cyclonedx&title=OWASP+CycloneDX" + } + ], + "transport-options": { + "relative": true + } + }, + { + "name": "opis/json-schema", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/opis/json-schema.git", + "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/json-schema/zipball/c48df6d7089a45f01e1c82432348f2d5976f9bfb", + "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb", + "shasum": "" + }, + "require": { + "ext-json": "*", + "opis/string": "^2.0", + "opis/uri": "^1.0", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "ext-bcmath": "*", + "ext-intl": "*", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\JsonSchema\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" + }, + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + } + ], + "description": "Json Schema Validator for PHP", + "homepage": "https://opis.io/json-schema", + "keywords": [ + "json", + "json-schema", + "schema", + "validation", + "validator" + ], + "support": { + "issues": "https://github.com/opis/json-schema/issues", + "source": "https://github.com/opis/json-schema/tree/2.3.0" + }, + "time": "2022-01-08T20:38:03+00:00" + }, + { + "name": "opis/string", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/opis/string.git", + "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/string/zipball/9ebf1a1f873f502f6859d11210b25a4bf5d141e7", + "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7", + "shasum": "" + }, + "require": { + "ext-iconv": "*", + "ext-json": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\String\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" + } + ], + "description": "Multibyte strings as objects", + "homepage": "https://opis.io/string", + "keywords": [ + "multi-byte", + "opis", + "string", + "string manipulation", + "utf-8" + ], + "support": { + "issues": "https://github.com/opis/string/issues", + "source": "https://github.com/opis/string/tree/2.0.1" + }, + "time": "2022-01-14T15:42:23+00:00" + }, + { + "name": "opis/uri", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/opis/uri.git", + "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/uri/zipball/0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a", + "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a", + "shasum": "" + }, + "require": { + "opis/string": "^2.0", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\Uri\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" + } + ], + "description": "Build, parse and validate URIs and URI-templates", + "homepage": "https://opis.io", + "keywords": [ + "URI Template", + "parse url", + "punycode", + "uri", + "uri components", + "url", + "validate uri" + ], + "support": { + "issues": "https://github.com/opis/uri/issues", + "source": "https://github.com/opis/uri/tree/1.1.0" + }, + "time": "2021-05-22T15:57:08+00:00" + }, + { + "name": "package-url/packageurl-php", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/package-url/packageurl-php.git", + "reference": "32058ad61f0d8b457fa26e7860bbd8b903196d3f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/package-url/packageurl-php/zipball/32058ad61f0d8b457fa26e7860bbd8b903196d3f", + "reference": "32058ad61f0d8b457fa26e7860bbd8b903196d3f", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "ext-json": "*", + "phpunit/phpunit": "9.6.16", + "roave/security-advisories": "dev-latest" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 4, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "PackageUrl\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Kowalleck", + "email": "jan.kowalleck@gmail.com", + "homepage": "https://github.com/jkowalleck" + } + ], + "description": "Builder and parser based on the package URL (purl) specification.", + "homepage": "https://github.com/package-url/packageurl-php#readme", + "keywords": [ + "package", + "package-url", + "packageurl", + "purl", + "url" + ], + "support": { + "issues": "https://github.com/package-url/packageurl-php/issues", + "source": "https://github.com/package-url/packageurl-php/tree/1.1.2" + }, + "funding": [ + { + "url": "https://github.com/sponsors/jkowalleck", + "type": "github" + } + ], + "time": "2024-02-05T11:20:07+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/cyclonedx-php-composer/default.nix b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix new file mode 100644 index 000000000000..d3af20b63bc7 --- /dev/null +++ b/pkgs/development/php-packages/cyclonedx-php-composer/default.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + php, +}: + +let + version = "5.2.0"; +in +php.buildComposerWithPlugin { + pname = "cyclonedx/cyclonedx-php-composer"; + inherit version; + + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-php-composer"; + rev = "v${version}"; + hash = "sha256-0fb1QiuVJqcB7CAEyB0y60/O9iiibT06mccZYe52dFQ="; + }; + + composerLock = ./composer.lock; + vendorHash = "sha256-QPlHWXXksetNSsv3olmCtPA/VsFVPV09rYQEsPezZoE="; + + meta = { + changelog = "https://github.com/CycloneDX/cyclonedx-php-composer/releases/tag/v${version}"; + description = "Composer plugin that facilitates the creation of a CycloneDX Software Bill of Materials (SBOM) from PHP Composer projects"; + homepage = "https://github.com/CycloneDX/cyclonedx-php-composer"; + license = lib.licenses.asl20; + mainProgram = "composer"; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 4a2f5005973b..24ba72477394 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -193,6 +193,8 @@ in { composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { }; + cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { }; + deployer = callPackage ../development/php-packages/deployer { }; grumphp = callPackage ../development/php-packages/grumphp { }; From 10813396d3c0fb2b08db2d51ccaf51c479d53fb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 23:48:22 +0000 Subject: [PATCH 034/311] jellyfin-web: 10.9.1 -> 10.9.2 --- pkgs/servers/jellyfin/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index a2437af14ee4..73bae649e834 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -26,16 +26,16 @@ let in buildNpmPackage' rec { pname = "jellyfin-web"; - version = "10.9.1"; + version = "10.9.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-KkPZ8OvGN/0gdoSVh9q0qEilae3tccgHRQQvrTsvycA="; + hash = "sha256-0MBVcMajRk+CR0nZ8Dtd3Mg4tKdLiHGs3AhI8BEqZyE="; }; - npmDepsHash = "sha256-LmbygyCYSp0gtjU2pNCV17WEyEoaIzPs7H9UoMFV+PU="; + npmDepsHash = "sha256-aN+EXHRXez26oS4Ad1d9HSBkwVKnvYQMJvJVypDCk+0="; npmBuildScript = [ "build:production" ]; From 7877140075610ffde57bc215a7e2302798620630 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 9 Jan 2024 10:29:38 +0300 Subject: [PATCH 035/311] buildDotnetModule: do not run dotnet command using env There should be no reason to use env here: 1. In places where it is used to run dotnet with environment variables, the same can be done with shell syntax. For example, `env "FOO=$bar" baz` is equivalent to `FOO="$bar" baz`. 2. Otherwise, it just unnecessarily forces PATH lookup for dotnet command. In addition to that, some dotnet invocations did not use env. --- .../dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh | 2 +- .../dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh | 2 +- .../dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh | 4 ++-- .../dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index 0acfeced9b16..798109291f92 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -41,7 +41,7 @@ dotnetBuildHook() { runtimeIdFlags+=("--runtime @runtimeId@") fi - env dotnet build ${project-} \ + dotnet build ${project-} \ -maxcpucount:$maxCpuFlag \ -p:BuildInParallel=$parallelBuildFlag \ -p:ContinuousIntegrationBuild=true \ diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index 507721ef9818..f19bf9f620fe 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -22,7 +22,7 @@ dotnetCheckHook() { runtimeIdFlags=("--runtime @runtimeId@") fi - env "LD_LIBRARY_PATH=@libraryPath@" \ + LD_LIBRARY_PATH="@libraryPath@" \ dotnet test "$project" \ -maxcpucount:$maxCpuFlag \ -p:ContinuousIntegrationBuild=true \ diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh index c046fc3c306b..3eb0d4e1f230 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -15,7 +15,7 @@ dotnetConfigureHook() { dotnetRestore() { local -r project="${1-}" - env dotnet restore ${project-} \ + dotnet restore ${project-} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --runtime "@runtimeId@" \ @@ -43,7 +43,7 @@ EOF find -name paket.dependencies -exec sed -i 's+source .*+source @nugetSource@/lib+g' {} \; find -name paket.lock -exec sed -i 's+remote:.*+remote: @nugetSource@/lib+g' {} \; - env dotnet tool restore --add-source "@nugetSource@/lib" + dotnet tool restore --add-source "@nugetSource@/lib" (( "${#projectFile[@]}" == 0 )) && dotnetRestore diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index d832eac28809..ed754d8ffcad 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -27,7 +27,7 @@ dotnetInstallHook() { runtimeIdFlags+=("--runtime @runtimeId@") fi - env dotnet publish ${project-} \ + dotnet publish ${project-} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --output "${installPath-$out/lib/$pname}" \ @@ -40,7 +40,7 @@ dotnetInstallHook() { dotnetPack() { local -r project="${1-}" - env dotnet pack ${project-} \ + dotnet pack ${project-} \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ --output "$out/share" \ From 7ae67c6fa2811783f214bb9227d791e5fc3e362c Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 14 May 2024 21:17:21 +0200 Subject: [PATCH 036/311] espanso: update darwin patches This commit also removes patches that seem no longer necessary, removes `--replace` calls that were not working, and uses `--replace-fail` going forward in keeping with the deprecation of `--replace`. Co-authored-by: Nathan Henrie --- pkgs/applications/office/espanso/default.nix | 24 +- .../office/espanso/inject-wx-on-darwin.patch | 223 ------------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 235 deletions(-) delete mode 100644 pkgs/applications/office/espanso/inject-wx-on-darwin.patch diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index b9e00a5ec313..14a4e6a25ffc 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -28,6 +28,7 @@ , QTKit , AVKit , WebKit +, System , waylandSupport ? false , x11Support ? stdenv.isLinux , testers @@ -55,10 +56,6 @@ rustPlatform.buildRustPackage rec { }; }; - cargoPatches = lib.optionals stdenv.isDarwin [ - ./inject-wx-on-darwin.patch - ]; - nativeBuildInputs = [ extra-cmake-modules pkg-config @@ -96,6 +93,7 @@ rustPlatform.buildRustPackage rec { QTKit AVKit WebKit + System ] ++ lib.optionals waylandSupport [ wl-clipboard ] ++ lib.optionals x11Support [ @@ -108,16 +106,13 @@ rustPlatform.buildRustPackage rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace scripts/create_bundle.sh \ - --replace target/mac/ $out/Applications/ \ - --replace /bin/echo ${coreutils}/bin/echo + --replace-fail target/mac/ $out/Applications/ \ + --replace-fail /bin/echo ${coreutils}/bin/echo patchShebangs scripts/create_bundle.sh substituteInPlace espanso/src/res/macos/Info.plist \ - --replace "espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" - substituteInPlace espanso/src/res/macos/com.federicoterzi.espanso.plist \ - --replace "/Applications/Espanso.app/Contents/MacOS/espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" \ - --replace "/usr/bin" "${placeholder "out"}/bin:/usr/bin" + --replace-fail "espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" substituteInPlace espanso/src/path/macos.rs espanso/src/path/linux.rs \ - --replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' + --replace-fail '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' ''; # Some tests require networking @@ -153,6 +148,13 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat pyrox0 ]; platforms = platforms.unix; + # With apple_sdk_10_12, + # kCFURLVolumeAvailableCapacityForImportantUsageKey + # is undefined. + # With apple_sdk_11_0, there is an issue with + # kColorSyncGenericGrayProfile. + broken = stdenv.hostPlatform.system == "x86_64-darwin"; + longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/pkgs/applications/office/espanso/inject-wx-on-darwin.patch b/pkgs/applications/office/espanso/inject-wx-on-darwin.patch deleted file mode 100644 index 34b711211927..000000000000 --- a/pkgs/applications/office/espanso/inject-wx-on-darwin.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 6a7400c20831c5ff502c7336d6db2be743f156be Mon Sep 17 00:00:00 2001 -From: Nikola Knezevic -Date: Tue, 16 Aug 2022 22:28:46 +0200 -Subject: [PATCH] Build using system wx on darwin - ---- - espanso-modulo/build.rs | 174 ++++------------------------------------ - 1 file changed, 17 insertions(+), 157 deletions(-) - -diff --git a/espanso-modulo/build.rs b/espanso-modulo/build.rs -index b8b889a..5d972ec 100644 ---- a/espanso-modulo/build.rs -+++ b/espanso-modulo/build.rs -@@ -156,161 +156,6 @@ fn build_native() { - ); - } - --#[cfg(target_os = "macos")] --fn build_native() { -- use std::process::Command; -- -- let project_dir = -- PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").expect("missing CARGO_MANIFEST_DIR")); -- let wx_archive = project_dir.join("vendor").join(WX_WIDGETS_ARCHIVE_NAME); -- if !wx_archive.is_file() { -- panic!("could not find wxWidgets archive!"); -- } -- -- let out_dir = if let Ok(out_path) = std::env::var(WX_WIDGETS_BUILD_OUT_DIR_ENV_NAME) { -- println!( -- "detected wxWidgets build output directory override: {}", -- out_path -- ); -- let path = PathBuf::from(out_path); -- std::fs::create_dir_all(&path).expect("unable to create wxWidgets out dir"); -- path -- } else { -- PathBuf::from(std::env::var("OUT_DIR").expect("missing OUT_DIR")) -- }; -- let out_wx_dir = out_dir.join("wx"); -- println!("wxWidgets will be compiled into: {}", out_wx_dir.display()); -- -- let target_arch = match std::env::var("CARGO_CFG_TARGET_ARCH") -- .expect("unable to read target arch") -- .as_str() -- { -- "x86_64" => "x86_64", -- "aarch64" => "arm64", -- arch => panic!("unsupported arch {}", arch), -- }; -- -- let should_use_ci_m1_workaround = -- std::env::var("CI").unwrap_or_default() == "true" && target_arch == "arm64"; -- -- if !out_wx_dir.is_dir() { -- // Extract the wxWidgets archive -- let wx_archive = -- std::fs::File::open(&wx_archive).expect("unable to open wxWidgets source archive"); -- let mut archive = zip::ZipArchive::new(wx_archive).expect("unable to read wxWidgets archive"); -- archive -- .extract(&out_wx_dir) -- .expect("unable to extract wxWidgets source dir"); -- -- // Compile wxWidgets -- let build_dir = out_wx_dir.join("build-cocoa"); -- std::fs::create_dir_all(&build_dir).expect("unable to create build-cocoa directory"); -- -- let mut handle = if should_use_ci_m1_workaround { -- // Because of a configuration problem on the GitHub CI pipeline, -- // we need to use a series of workarounds to build for M1 machines. -- // See: https://github.com/actions/virtual-environments/issues/3288#issuecomment-830207746 -- Command::new(out_wx_dir.join("configure")) -- .current_dir(build_dir.to_string_lossy().to_string()) -- .args(&[ -- "--disable-shared", -- "--without-libtiff", -- "--without-liblzma", -- "--with-libjpeg=builtin", -- "--with-libpng=builtin", -- "--enable-universal-binary=arm64,x86_64", -- ]) -- .spawn() -- .expect("failed to execute configure") -- } else { -- Command::new(out_wx_dir.join("configure")) -- .current_dir(build_dir.to_string_lossy().to_string()) -- .args(&[ -- "--disable-shared", -- "--without-libtiff", -- "--without-liblzma", -- "--with-libjpeg=builtin", -- "--with-libpng=builtin", -- &format!("--enable-macosx_arch={}", target_arch), -- ]) -- .spawn() -- .expect("failed to execute configure") -- }; -- -- if !handle -- .wait() -- .expect("unable to wait for configure command") -- .success() -- { -- panic!("configure returned non-zero exit code!"); -- } -- -- let mut handle = Command::new("make") -- .current_dir(build_dir.to_string_lossy().to_string()) -- .args(&["-j8"]) -- .spawn() -- .expect("failed to execute make"); -- if !handle -- .wait() -- .expect("unable to wait for make command") -- .success() -- { -- panic!("make returned non-zero exit code!"); -- } -- } -- -- // Make sure wxWidgets is compiled -- if !out_wx_dir.join("build-cocoa").is_dir() { -- panic!("wxWidgets is not compiled correctly, missing 'build-cocoa/' directory") -- } -- -- // If using the M1 CI workaround, convert all the universal libraries to arm64 ones -- // This is needed until https://github.com/rust-lang/rust/issues/55235 is fixed -- if should_use_ci_m1_workaround { -- convert_fat_libraries_to_arm(&out_wx_dir.join("build-cocoa").join("lib")); -- convert_fat_libraries_to_arm(&out_wx_dir.join("build-cocoa")); -- } -- -- let config_path = out_wx_dir.join("build-cocoa").join("wx-config"); -- let cpp_flags = get_cpp_flags(&config_path); -- -- let mut build = cc::Build::new(); -- build -- .cpp(true) -- .file("src/sys/form/form.cpp") -- .file("src/sys/common/common.cpp") -- .file("src/sys/search/search.cpp") -- .file("src/sys/wizard/wizard.cpp") -- .file("src/sys/wizard/wizard_gui.cpp") -- .file("src/sys/welcome/welcome.cpp") -- .file("src/sys/welcome/welcome_gui.cpp") -- .file("src/sys/textview/textview.cpp") -- .file("src/sys/textview/textview_gui.cpp") -- .file("src/sys/troubleshooting/troubleshooting.cpp") -- .file("src/sys/troubleshooting/troubleshooting_gui.cpp") -- .file("src/sys/common/mac.mm"); -- build.flag("-std=c++17"); -- -- for flag in cpp_flags { -- build.flag(&flag); -- } -- -- build.compile("espansomodulosys"); -- -- // Render linker flags -- -- generate_linker_flags(&config_path); -- -- // On (older) OSX we need to link against the clang runtime, -- // which is hidden in some non-default path. -- // -- // More details at https://github.com/alexcrichton/curl-rust/issues/279. -- if let Some(path) = macos_link_search_path() { -- println!("cargo:rustc-link-lib=clang_rt.osx"); -- println!("cargo:rustc-link-search={}", path); -- } --} -- - #[cfg(target_os = "macos")] - fn convert_fat_libraries_to_arm(lib_dir: &Path) { - for entry in -@@ -440,12 +285,17 @@ fn macos_link_search_path() -> Option { - None - } - -+#[cfg(not(target_os = "macos"))] -+fn macos_link_search_path() -> Option { -+ return None -+} -+ - // TODO: add documentation for linux - // Install wxWidgets: - // sudo apt install libwxgtk3.0-0v5 libwxgtk3.0-dev - // - // cargo run --#[cfg(target_os = "linux")] -+#[cfg(not(target_os = "windows"))] - fn build_native() { - // Make sure wxWidgets is installed - // Depending on the installation package, the 'wx-config' command might also be available as 'wx-config-gtk3', -@@ -483,7 +333,8 @@ fn build_native() { - .file("src/sys/textview/textview.cpp") - .file("src/sys/textview/textview_gui.cpp") - .file("src/sys/troubleshooting/troubleshooting.cpp") -- .file("src/sys/troubleshooting/troubleshooting_gui.cpp"); -+ .file("src/sys/troubleshooting/troubleshooting_gui.cpp") -+ .file("src/sys/common/mac.mm"); - build.flag("-std=c++17"); - - for flag in cpp_flags { -@@ -495,6 +346,15 @@ fn build_native() { - // Render linker flags - - generate_linker_flags(&config_path); -+ -+ // On (older) OSX we need to link against the clang runtime, -+ // which is hidden in some non-default path. -+ // -+ // More details at https://github.com/alexcrichton/curl-rust/issues/279. -+ if let Some(path) = macos_link_search_path() { -+ println!("cargo:rustc-link-lib=clang_rt.osx"); -+ println!("cargo:rustc-link-search={}", path); -+ } - } - - fn main() { --- -2.37.1 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70c7e48a82bb..43add667bd6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5135,7 +5135,7 @@ with pkgs; eschalot = callPackage ../tools/security/eschalot { }; espanso = callPackage ../applications/office/espanso { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit System; }; espanso-wayland = espanso.override { x11Support = false; From d4d4513dfb75bd2d9cd614248cd0e9635cb87e26 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 14 May 2024 21:29:33 +0200 Subject: [PATCH 037/311] espanso: add n8henrie as maintainer --- pkgs/applications/office/espanso/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 14a4e6a25ffc..c8883f36339e 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -146,7 +146,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "espanso"; homepage = "https://espanso.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kimat pyrox0 ]; + maintainers = with maintainers; [ kimat pyrox0 n8henrie ]; platforms = platforms.unix; # With apple_sdk_10_12, # kCFURLVolumeAvailableCapacityForImportantUsageKey From 0301d0487d9550be7be449c9fc27ac8f59da9361 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:18:28 +0200 Subject: [PATCH 038/311] azure-cli-extensions.astronomer: init at 1.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 8e872e7bba25..78183ddaa150 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -111,6 +111,13 @@ sha256 = "9107762296c67ef4035256a9790b075040f263804116a3f9a6866227ff6019ed"; description = "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension"; }; + astronomer = mkAzExtension rec { + pname = "astronomer"; + version = "1.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-${version}-py3-none-any.whl"; + sha256 = "b4ca41b5d9cb77aed2b462ded4a392ae3ce896ce8d9cb94a08671d0cb68176cd"; + description = "Microsoft Azure Command-Line Tools Astronomer Extension"; + }; authV2 = mkAzExtension rec { pname = "authV2"; version = "0.1.3"; From 37650e2f120539da89f2a939e8f3e02eb89a9dd4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:21:13 +0200 Subject: [PATCH 039/311] azure-cli-extensions.blockchain: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 ------- pkgs/tools/admin/azure-cli/extensions-manual.nix | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 78183ddaa150..1aac6b1fad79 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -181,13 +181,6 @@ sha256 = "f71250d1c26690cc0e175cd5c9bcd59e76c7b701bb3a47c8273e4cf8bcca878e"; description = "Microsoft Azure Command-Line Tools BillingBenefits Extension"; }; - blockchain = mkAzExtension rec { - pname = "blockchain"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/blockchain-${version}-py3-none-any.whl"; - sha256 = "95a4788ab10052f6c1b4122db6ab140705db528e5cb3db3358580d703a2a7204"; - description = "Microsoft Azure Command-Line Tools BlockchainManagementClient Extension"; - }; blueprint = mkAzExtension rec { pname = "blueprint"; version = "0.3.2"; diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index e69888b216b9..1ae9845f2d45 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -13,4 +13,7 @@ distro ]; }; + + # Removed extensions + blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 } From dfa9b50457cc248f02228191715353c6074ef42b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:21:51 +0200 Subject: [PATCH 040/311] azure-cli-extensions.compute-diagnostic-rp: init at 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 1aac6b1fad79..827221892f01 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -202,6 +202,13 @@ sha256 = "9ea6162d37fc3390be4dce64cb05c5c588070104f3e92a701ab475473565a8a9"; description = "Translate ARM template to executable Azure CLI scripts"; }; + compute-diagnostic-rp = mkAzExtension rec { + pname = "compute-diagnostic-rp"; + version = "1.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-${version}-py3-none-any.whl"; + sha256 = "810e93ce00c7d03df6da9a0faf57b966fb6da582311f9cae74b2b7e1e3c41423"; + description = "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension"; + }; confidentialledger = mkAzExtension rec { pname = "confidentialledger"; version = "1.0.0"; From f97f2317d620ac6ba50c7dc26cd2c126b6cbd083 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:22:25 +0200 Subject: [PATCH 041/311] azure-cli-extensions.edgezones: init at 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 827221892f01..109d569bc058 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -398,6 +398,13 @@ sha256 = "186a06d0f8603f7e0faeed5296ecc73bf1096e0d681acea42d5ebccc1670357b"; description = "Microsoft Azure Command-Line Tools EdgeOrderManagementClient Extension"; }; + edgezones = mkAzExtension rec { + pname = "edgezones"; + version = "1.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/edgezones-${version}-py3-none-any.whl"; + sha256 = "98f1b962dcbb078cfb8cd12d40a58d01bcc37db441570f84e293ba0ba52c6c08"; + description = "Microsoft Azure Command-Line Tools Edgezones Extension"; + }; elastic = mkAzExtension rec { pname = "elastic"; version = "1.0.0b2"; From df775e74a3c971fefb88f3e8bec7aa561c04f9a4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:22:55 +0200 Subject: [PATCH 042/311] azure-cli-extensions.gallery-service-artifact: init at 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 109d569bc058..cb4bbc45aa00 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -468,6 +468,13 @@ sha256 = "84abeed03b4bbfa7b8c0be08d9366ff3040e2160df4f5a539f0e1c9e0a1c359c"; description = "Microsoft Azure Command-Line Tools fzf Extension"; }; + gallery-service-artifact = mkAzExtension rec { + pname = "gallery-service-artifact"; + version = "1.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/gallery_service_artifact-${version}-py3-none-any.whl"; + sha256 = "3f30e3e8e7e678fd9ab91b2261fb918a303cd382626509d3f00e86f1967750c6"; + description = "Microsoft Azure Command-Line Tools GalleryServiceArtifact Extension"; + }; graphservices = mkAzExtension rec { pname = "graphservices"; version = "1.0.0b1"; From bc93e9633baf66287f706521393787bda32bffae Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:23:31 +0200 Subject: [PATCH 043/311] azure-cli-extensions.firmwareanalysis: init at 1.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index cb4bbc45aa00..32c48cfa51f0 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -433,6 +433,13 @@ sha256 = "b83f723baae0ea04557a87f358fa2131baf15d45cd3aba7a9ab42d14ec80df38"; description = "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection"; }; + firmwareanalysis = mkAzExtension rec { + pname = "firmwareanalysis"; + version = "1.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-${version}-py3-none-any.whl"; + sha256 = "1c3df1441de76edb08bed05ac279dd2b02bd6fab68a0b9a495dfd7ecce3e92cb"; + description = "Microsoft Azure Command-Line Tools Firmwareanalysis Extension"; + }; fleet = mkAzExtension rec { pname = "fleet"; version = "1.0.3"; From 1308d3dbb9e108e403f70b29bc1af6c2a4deb629 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:24:14 +0200 Subject: [PATCH 044/311] azure-cli-extensions.mdp: init at 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 32c48cfa51f0..5829f897a973 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -650,6 +650,13 @@ sha256 = "22ddf4b1cdc77e99262cb6089c4d96040065828a1d38a2709fdb945d3c851839"; description = "Support for Management Partner preview"; }; + mdp = mkAzExtension rec { + pname = "mdp"; + version = "1.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-${version}-py3-none-any.whl"; + sha256 = "7875607d84eaf835afe73b9eee9280a5169c5b0b1dd1b66a6eff593fe292a4de"; + description = "Microsoft Azure Command-Line Tools Mdp Extension"; + }; mixed-reality = mkAzExtension rec { pname = "mixed-reality"; version = "0.0.5"; From ebe7273b2bc69e374bf30d381117e5e1a68be5c7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:26:12 +0200 Subject: [PATCH 045/311] azure-cli-extensions.trustedsigning: init at 1.0.0b2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 5829f897a973..e810ac68d3e7 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -965,6 +965,13 @@ sha256 = "98bda4d9a9233efb0ae1c5fae1a6c2a42942e8a71b0ebf19d3a7193548b13ff2"; description = "Microsoft Azure Command-Line Tools TrafficCollector Extension"; }; + trustedsigning = mkAzExtension rec { + pname = "trustedsigning"; + version = "1.0.0b2"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/trustedsigning-${version}-py3-none-any.whl"; + sha256 = "c3ae869c1371493180b9ed71db0bdc3842bad54c8832beb6007118d26bed71e8"; + description = "Microsoft Azure Command-Line Tools Trustedsigning Extension"; + }; virtual-network-manager = mkAzExtension rec { pname = "virtual-network-manager"; version = "1.0.1"; From 981895992b892181005f24f1b187423967f7ec2a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:27:29 +0200 Subject: [PATCH 046/311] azure-cli-extensions.standbypool: init at 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index e810ac68d3e7..210a67ac3c00 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -902,6 +902,13 @@ sha256 = "cc99134288545178d08b18abd5b7c9e3d099d2add8b52ab9308f6c5fd97ae60c"; description = "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension "; }; + standbypool = mkAzExtension rec { + pname = "standbypool"; + version = "1.0.0b1"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-${version}-py3-none-any.whl"; + sha256 = "44c03e320c8b49f52390e3c11d61b25a67afeffc18d62baa522c373142de0e15"; + description = "Microsoft Azure Command-Line Tools Standbypool Extension"; + }; staticwebapp = mkAzExtension rec { pname = "staticwebapp"; version = "1.0.0"; From 4ddf2c04f19663d5c3f1a9e4205c08d7a04e6edc Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:29:00 +0200 Subject: [PATCH 047/311] azure-cli-extensions.datamigration: 0.6.1 -> 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 210a67ac3c00..5069818f0edb 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -309,9 +309,9 @@ }; datamigration = mkAzExtension rec { pname = "datamigration"; - version = "0.6.1"; + version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-${version}-py3-none-any.whl"; - sha256 = "4a07a5272762f8f53f9fe61b295a800e63c0ea2900a29a526df2eabbe732bca7"; + sha256 = "9d1ac8c7046e23387696561747be2e8f62e879a4a305f8b20ccd19460a29db0d"; description = "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"; }; dataprotection = mkAzExtension rec { From ac076e2cf954a01871f6dd5f97e4377050d183d0 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:30:49 +0200 Subject: [PATCH 048/311] azure-cli-extensions.aks-preview: 1.0.0b5 -> 3.0.0b9 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 5069818f0edb..25ef5b353a4d 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -57,9 +57,9 @@ }; aks-preview = mkAzExtension rec { pname = "aks-preview"; - version = "1.0.0b5"; + version = "3.0.0b9"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "75378ea07dea6fdadb115e41e8394003fd63282560648fa92d8f055f1e2536eb"; + sha256 = "3d5e43cd1b92ef9abe959fd2aea3e3c66dbebe2cd22df6fdb8abcf7b6682bbd9"; description = "Provides a preview for upcoming AKS features"; }; akshybrid = mkAzExtension rec { From 5967b3689658c46ac2191e265815e7d3c3145ed6 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:01 +0200 Subject: [PATCH 049/311] azure-cli-extensions.amg: 1.2.9 -> 1.3.2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 25ef5b353a4d..866abad39823 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -85,9 +85,9 @@ }; amg = mkAzExtension rec { pname = "amg"; - version = "1.2.9"; + version = "1.3.2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "dbea8dd0e85dd2f30f30cb66f0dd7f9d0314a7ff9765a4d074622b75aeccad2f"; + sha256 = "cf31e9336e8b8bf63b7a1362ea05871f65493cfd49fd4a2cb73c1cb63c81f91a"; description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; }; amlfs = mkAzExtension rec { From 48906871f13c87ca0d4c4875f74c77db16411baf Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:01 +0200 Subject: [PATCH 050/311] azure-cli-extensions.appservice-kube: 0.1.9 -> 0.1.10 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 866abad39823..ea46c2f46ce8 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -106,9 +106,9 @@ }; appservice-kube = mkAzExtension rec { pname = "appservice-kube"; - version = "0.1.9"; + version = "0.1.10"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-${version}-py2.py3-none-any.whl"; - sha256 = "9107762296c67ef4035256a9790b075040f263804116a3f9a6866227ff6019ed"; + sha256 = "7fd72d27e4b0eceda3b2b4f301c7a0c3068fea8b96d70f9fcaad142240de7d0d"; description = "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension"; }; astronomer = mkAzExtension rec { From 50baaf5074f1fefb5646f32cee596f34a38be044 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:01 +0200 Subject: [PATCH 051/311] azure-cli-extensions.automation: 0.2.2 -> 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index ea46c2f46ce8..c3ecce197507 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -134,9 +134,9 @@ }; automation = mkAzExtension rec { pname = "automation"; - version = "0.2.2"; + version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/automation-${version}-py3-none-any.whl"; - sha256 = "1337a8bf90739df646231533801cce9050bad641c627382468c86af5f2f99d89"; + sha256 = "d31fe0433fa30a6e009f7b9bee6c417a686ed87502dd987b9ac8ad113383915b"; description = "Microsoft Azure Command-Line Tools AutomationClient Extension"; }; azure-firewall = mkAzExtension rec { From 8c3c99775140f7c8789d3bd2665e7191a3f60318 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:02 +0200 Subject: [PATCH 052/311] azure-cli-extensions.confluent: 0.4.0 -> 0.6.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index c3ecce197507..9ad4b58b2bb5 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -218,9 +218,9 @@ }; confluent = mkAzExtension rec { pname = "confluent"; - version = "0.4.0"; + version = "0.6.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-${version}-py3-none-any.whl"; - sha256 = "7b812940a77094bc916c745a61b7732966de4e7943a7541c0a402c0d912bc6af"; + sha256 = "7987d22e0e9cada28087a900bfa534865531941f2bbfe967eb46c90b2e0a12be"; description = "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension"; }; connectedmachine = mkAzExtension rec { From b2ed59b1aa191ea8e8173cb6559e6233d05565fb Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:02 +0200 Subject: [PATCH 053/311] azure-cli-extensions.connectedvmware: 0.2.4 -> 1.0.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 9ad4b58b2bb5..cda20b49d7de 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -232,9 +232,9 @@ }; connectedvmware = mkAzExtension rec { pname = "connectedvmware"; - version = "0.2.4"; + version = "1.0.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-${version}-py2.py3-none-any.whl"; - sha256 = "8a96c790317dfee523d548c28a51191746ff3b45ede4fee56e804d195de437f6"; + sha256 = "92bcb19c2d19f7e5cf3e8527894324937380b831de19845cf4d382092c5dff39"; description = "Microsoft Azure Command-Line Tools Connectedvmware Extension"; }; connection-monitor-preview = mkAzExtension rec { From aedf27e80ac262b78828b9fea2e4aea9fdbe763a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:02 +0200 Subject: [PATCH 054/311] azure-cli-extensions.cosmosdb-preview: 0.26.0 -> 1.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index cda20b49d7de..00a64c4c2ea8 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -246,9 +246,9 @@ }; cosmosdb-preview = mkAzExtension rec { pname = "cosmosdb-preview"; - version = "0.26.0"; + version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-${version}-py2.py3-none-any.whl"; - sha256 = "c761a022fa8e849534d51bb51c6b6a7c01b541a5f018532f7fe312f74f689b06"; + sha256 = "3a5910873138adf747ba8baed7be180981a74569c86c927ea6f1ae39d3de53bf"; description = "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"; }; costmanagement = mkAzExtension rec { From a1ffe3b4cc80162d79e8d502b8975823e14366aa Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:03 +0200 Subject: [PATCH 055/311] azure-cli-extensions.dataprotection: 0.11.2 -> 1.1.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 00a64c4c2ea8..8f8218173821 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -316,9 +316,9 @@ }; dataprotection = mkAzExtension rec { pname = "dataprotection"; - version = "0.11.2"; + version = "1.1.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl"; - sha256 = "ce31a7bb0c939d6eb6d71971f89441abaee172a3ba5b74dae0ebe88e4a8f5300"; + sha256 = "bb3774425d586d03b4e26ffa0021c0024b79227963ec003430e9cd6beaa2cac7"; description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension"; }; datashare = mkAzExtension rec { From 83f98a6fccf3ae141390447c634806a4962b53d3 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:03 +0200 Subject: [PATCH 056/311] azure-cli-extensions.desktopvirtualization: 0.2.0 -> 1.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 8f8218173821..ba7a578633b9 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -337,10 +337,10 @@ }; desktopvirtualization = mkAzExtension rec { pname = "desktopvirtualization"; - version = "0.2.0"; + version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/desktopvirtualization-${version}-py3-none-any.whl"; - sha256 = "6de28d6be58dd65ad8f25a9fa084676c54684f00f9938f5db7d0392282783e04"; - description = "Microsoft Azure Command-Line Tools DesktopVirtualizationAPIClient Extension"; + sha256 = "3a1e7a8f0e579fa21fed770859b21c23bec8b8489d834a61411695a9a90c7cd4"; + description = "Microsoft Azure Command-Line Tools Desktopvirtualization Extension"; }; dev-spaces = mkAzExtension rec { pname = "dev-spaces"; From 0a620f0dbc46386fd3d563e5db2a26fc7a1ad960 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:03 +0200 Subject: [PATCH 057/311] azure-cli-extensions.devcenter: 5.0.0 -> 5.0.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index ba7a578633b9..ee691b6c99b2 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -351,9 +351,9 @@ }; devcenter = mkAzExtension rec { pname = "devcenter"; - version = "5.0.0"; + version = "5.0.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-${version}-py3-none-any.whl"; - sha256 = "873ce4ec274710a361ba2a6bf93d8820949d955bf4386881d9a37ed87bb0d054"; + sha256 = "f90caa530ef9a11d0e4706b94a860edca419205d4a528dab72859dd6d7870b9c"; description = "Microsoft Azure Command-Line Tools DevCenter Extension"; }; diskpool = mkAzExtension rec { From 128e8bf2e2cfe416079d7bc528110b1fa8295fbb Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:03 +0200 Subject: [PATCH 058/311] azure-cli-extensions.fleet: 1.0.3 -> 1.1.2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index ee691b6c99b2..a759e8f7089f 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -442,9 +442,9 @@ }; fleet = mkAzExtension rec { pname = "fleet"; - version = "1.0.3"; + version = "1.1.2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-${version}-py3-none-any.whl"; - sha256 = "cd93b819d0a8c1ab50f4aec00b31623fd01040362c4cd633a89ba03fc894eb73"; + sha256 = "d0d2cf188da6a2f72ebc335d1ff82827c84a4965e23188e3408c85b90e2131dc"; description = "Microsoft Azure Command-Line Tools Fleet Extension"; }; fluid-relay = mkAzExtension rec { From 45ac705bd4659da23575369dbfdece574ac8290b Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:04 +0200 Subject: [PATCH 059/311] azure-cli-extensions.hdinsightonaks: 1.0.0b1 -> 1.0.0b2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index a759e8f7089f..d7e5dbd352ff 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -512,9 +512,9 @@ }; hdinsightonaks = mkAzExtension rec { pname = "hdinsightonaks"; - version = "1.0.0b1"; + version = "1.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl"; - sha256 = "566c30d67d6b524ac25f77342121e0e7a6ed4ab0af561fcc6e94b0629a03f40c"; + sha256 = "c323291952f9ec6014af5f760b26860bd8029aa04cc226fd5996f20726641c59"; description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"; }; healthbot = mkAzExtension rec { From 428b56d81aaa052dc787fee0c072c0decdcbebaf Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:04 +0200 Subject: [PATCH 060/311] azure-cli-extensions.k8s-extension: 1.6.0 -> 1.6.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index d7e5dbd352ff..7b772c80b754 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -582,9 +582,9 @@ }; k8s-extension = mkAzExtension rec { pname = "k8s-extension"; - version = "1.6.0"; + version = "1.6.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-${version}-py3-none-any.whl"; - sha256 = "27a9996a9ace11856f37719ae697f0ac98d368dde6eb8648d111aafc136599a7"; + sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c"; description = "Microsoft Azure Command-Line Tools K8s-extension Extension"; }; kusto = mkAzExtension rec { From fbed1350f6b728d8cac8f61e1c086f1bce1a9289 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:04 +0200 Subject: [PATCH 061/311] azure-cli-extensions.maintenance: 1.5.0 -> 1.6.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 7b772c80b754..2db68af6e384 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -624,9 +624,9 @@ }; maintenance = mkAzExtension rec { pname = "maintenance"; - version = "1.5.0"; + version = "1.6.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-${version}-py3-none-any.whl"; - sha256 = "4f1336fed4fa2cbea640627676a6cab4399c1b29ae23cb21fe73c9bea0d80a7f"; + sha256 = "3ab6a2dac48ba71b28bc8ee05d254daa72b62f84dda953749fa621a80ca39ae5"; description = "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"; }; managedccfs = mkAzExtension rec { From bdf796089709cedfc9333adc843d677685029614 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:04 +0200 Subject: [PATCH 062/311] azure-cli-extensions.managednetworkfabric: 4.2.0 -> 6.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 2db68af6e384..0dd7e26b2c0e 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -638,9 +638,9 @@ }; managednetworkfabric = mkAzExtension rec { pname = "managednetworkfabric"; - version = "4.2.0"; + version = "6.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-${version}-py3-none-any.whl"; - sha256 = "f80f528a099862fa8e792f770943a832dbb958b503cc5cc8cb6f58766056d857"; + sha256 = "340483c69484865bb4e2cadc97aa5f6b258ee894920f4df0dd74ac412a8b2d59"; description = "Support for managednetworkfabric commands based on 2023-06-15 API version"; }; managementpartner = mkAzExtension rec { From c6f2501197c86904cab26f58deed6f3af5798f50 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:05 +0200 Subject: [PATCH 063/311] azure-cli-extensions.mobile-network: 0.2.1 -> 1.0.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 0dd7e26b2c0e..1fd0dc9f80c9 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -666,9 +666,9 @@ }; mobile-network = mkAzExtension rec { pname = "mobile-network"; - version = "0.2.1"; + version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/mobile_network-${version}-py3-none-any.whl"; - sha256 = "66bd39f687c2ac030ab6bd44b8746ec8d64c4804b44592c0bb1ffda837dce22b"; + sha256 = "2d9572a4ed706df8f626c62036ad22f46a15b113273f8ff9b06313a380a27f56"; description = "Microsoft Azure Command-Line Tools MobileNetwork Extension"; }; monitor-control-service = mkAzExtension rec { From 73becb23f19b0de1b7f849aa3588bb569a6ccdea Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:05 +0200 Subject: [PATCH 064/311] azure-cli-extensions.nginx: 0.1.1 -> 2.0.0b2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 1fd0dc9f80c9..f8f6cbcfdabc 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -708,9 +708,9 @@ }; nginx = mkAzExtension rec { pname = "nginx"; - version = "0.1.1"; + version = "2.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-${version}-py2.py3-none-any.whl"; - sha256 = "3234129a26043a68e80ee1ae31c36e7ef8b2691a096cd6fc557e3a46fea8170e"; + sha256 = "7f26070f348d7af3132974f4393fb993eba5293ae18494af6a868e85aa34103c"; description = "Microsoft Azure Command-Line Tools Nginx Extension"; }; notification-hub = mkAzExtension rec { From c2f166c1f22aedd9e89eda19ff825b7852717af2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:05 +0200 Subject: [PATCH 065/311] azure-cli-extensions.scheduled-query: 0.5.3 -> 1.0.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index f8f6cbcfdabc..7aa013263fec 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -841,9 +841,9 @@ }; scheduled-query = mkAzExtension rec { pname = "scheduled-query"; - version = "0.5.3"; + version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-${version}-py2.py3-none-any.whl"; - sha256 = "b141ce4ff7678484561e9f3c842d8249112a465b7a0da07a6da49856920f8534"; + sha256 = "fd5e69d0438b8089dbe197d5ba4c41776aed906941cac374755a4c9044c4af04"; description = "Microsoft Azure Command-Line Tools Scheduled_query Extension"; }; scvmm = mkAzExtension rec { From 9cbd5eb32ff857c8dc5147889f07ff1b65242090 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:06 +0200 Subject: [PATCH 066/311] azure-cli-extensions.self-help: 0.2.0 -> 0.3.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 7aa013263fec..f029a70dd12b 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -855,9 +855,9 @@ }; self-help = mkAzExtension rec { pname = "self-help"; - version = "0.2.0"; + version = "0.3.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-${version}-py3-none-any.whl"; - sha256 = "a57d629f75443666af570188716eaf2b9182da41f6d2f958f6d53d79b830b23e"; + sha256 = "0545610ee482069ad89c3fcc342e3d94f72b4d5eb139312c778501c843e8216d"; description = "Microsoft Azure Command-Line Tools SelfHelp Extension"; }; sentinel = mkAzExtension rec { From 90c73ec869d86a84540d9e39cbfb9182db56e924 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:06 +0200 Subject: [PATCH 067/311] azure-cli-extensions.spring: 1.19.3 -> 1.21.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index f029a70dd12b..da50f9fc6a80 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -876,9 +876,9 @@ }; spring = mkAzExtension rec { pname = "spring"; - version = "1.19.3"; + version = "1.21.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring-${version}-py3-none-any.whl"; - sha256 = "80cbd41e563231e500670402b01e95150adce18b7c128320c3d2393284e0d5d5"; + sha256 = "a513aff7c4034e4b7016b948ae6fcfabcc0c754c1631d619233ea7bf61508ab1"; description = "Microsoft Azure Command-Line Tools spring Extension"; }; spring-cloud = mkAzExtension rec { From 1d2f7c411eb38c0ea4d1ea87d91d2d7172d897c9 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:48:53 +0200 Subject: [PATCH 068/311] azure-cli-extensions.stack-hci-vm: 0.1.11 -> 1.1.2 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index da50f9fc6a80..314e9228abad 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -897,10 +897,10 @@ }; stack-hci-vm = mkAzExtension rec { pname = "stack-hci-vm"; - version = "0.1.11"; - url = "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/stack_hci_vm-${version}.1-py3-none-any.whl"; - sha256 = "cc99134288545178d08b18abd5b7c9e3d099d2add8b52ab9308f6c5fd97ae60c"; - description = "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension "; + version = "1.1.2"; + url = "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/stack_hci_vm-${version}-py3-none-any.whl"; + sha256 = "eac2401a6aebfcacd2f9d7dd468c00024b2b83ecfe72e33c77697b04a2af0d20"; + description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"; }; standbypool = mkAzExtension rec { pname = "standbypool"; From dc9d2bd330be2b4db08613e941edbaa396b6b1d5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:06 +0200 Subject: [PATCH 069/311] azure-cli-extensions.support: 1.0.3 -> 1.0.4 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 314e9228abad..4b07c2abbd3c 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -953,9 +953,9 @@ }; support = mkAzExtension rec { pname = "support"; - version = "1.0.3"; + version = "1.0.4"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/support-${version}-py2.py3-none-any.whl"; - sha256 = "9f5b4ebc6a90b48d2a3c18ce7b74d89240275dcf23aa836b8509882b1ee28c56"; + sha256 = "ac554e2b6362a9a6ff8e03000730df31dd72781aba8bbdcf05ceb44ce1b680a0"; description = "Microsoft Azure Command-Line Tools Support Extension"; }; timeseriesinsights = mkAzExtension rec { From cf344eadc2a3e3b6e8ef954eb6731ee3bdd709be Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:45:59 +0200 Subject: [PATCH 070/311] azure-cli-extensions.virtual-wan: 0.3.0 -> 1.0.5 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 4b07c2abbd3c..71daf632cd6a 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -995,9 +995,9 @@ }; virtual-wan = mkAzExtension rec { pname = "virtual-wan"; - version = "0.3.0"; + version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-${version}-py2.py3-none-any.whl"; - sha256 = "e5f4e9d4398cf0fcd656c0107386adbc8493e69e3158af6c5145ed23aaf77165"; + sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d"; description = "Manage virtual WAN, hubs, VPN gateways and VPN sites"; }; vm-repair = mkAzExtension rec { From 51d46d5aa04cbfd3c7a7ecf3ef7b69503dc1f3f1 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:46:43 +0200 Subject: [PATCH 071/311] azure-cli-extensions.vm-repair: 1.0.0b1 -> 1.0.5 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 71daf632cd6a..2bb6a8aa21a4 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -1002,9 +1002,9 @@ }; vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "1.0.0b1"; + version = "1.0.5"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - sha256 = "7e6b9fb9952a56811d65de87b87b0403a6161edfa82284a43fa58f176e397b8b"; + sha256 = "f2f7bc5698f89e0f6254464dc18d04d477dab4aab93296a46649018723855b26"; description = "Auto repair commands to fix VMs"; }; vmware = mkAzExtension rec { From dca69ae225270fed574697118c5b5fd89e1f5db9 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:31:07 +0200 Subject: [PATCH 072/311] azure-cli-extensions.workloads: 0.1.0a1 -> 1.1.0b1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/extensions-generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-generated.nix b/pkgs/tools/admin/azure-cli/extensions-generated.nix index 2bb6a8aa21a4..a6b09821283f 100644 --- a/pkgs/tools/admin/azure-cli/extensions-generated.nix +++ b/pkgs/tools/admin/azure-cli/extensions-generated.nix @@ -1023,9 +1023,9 @@ }; workloads = mkAzExtension rec { pname = "workloads"; - version = "0.1.0a1"; + version = "1.1.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-${version}-py3-none-any.whl"; - sha256 = "0e5ba95c3799d043fc2ba869ce0c5b2eea200357a8b0cbd2b2733bb91d4cc7a8"; + sha256 = "262c41b08b831d689802634bb1a0fea0add38c3611f27b2036576d45232a1ff5"; description = "Microsoft Azure Command-Line Tools Workloads Extension"; }; } From 9f4f4494ff9efb7f997edbc482e694d6e69a97b0 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:36:11 +0200 Subject: [PATCH 073/311] azure-cli-extensions: add commit helper script Just a tiny thing I wrote to to help when updating extensions. WIP. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../admin/azure-cli/commit-update-hunks.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 pkgs/tools/admin/azure-cli/commit-update-hunks.sh diff --git a/pkgs/tools/admin/azure-cli/commit-update-hunks.sh b/pkgs/tools/admin/azure-cli/commit-update-hunks.sh new file mode 100755 index 000000000000..7a9d913e260e --- /dev/null +++ b/pkgs/tools/admin/azure-cli/commit-update-hunks.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# Just a tiny imperfect helper script to commit generated updates. +# +# First, ensure that that `git add -p extensions-generated.nix` only +# returns a series of clean update hunks, where each hunk updates a +# single package version. All additions/removals must be committed +# by hand. +# The script will then commit the remaining hunks with fitting commit messages. + +while true; do + echo -e "y\nq" | git add -p extensions-generated.nix || break + pname=$(git diff --no-ext-diff --cached | grep "pname =" | cut -d'"' -f2 | head -n1) || break + versions=$(git diff --no-ext-diff --cached | grep "version =" | cut -d'"' -f2) || break + oldver=$(echo "$versions" | head -n1) || break + newver=$(echo "$versions" | tail -n1) || break + commitmsg="azure-cli-extensions.${pname}: ${oldver} -> ${newver}" + git commit -m "$commitmsg" +done From 02e9c36e59ecdc0ac45be4b4976bb3497135c796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 20 May 2024 22:01:52 +0200 Subject: [PATCH 074/311] nixos/archisteamfarm: fix crash when web-ui is disabled --- nixos/modules/services/games/archisteamfarm.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index 33898f8387e9..c9c41d6f4eb5 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -164,8 +164,11 @@ in }; config = lib.mkIf cfg.enable { - # TODO: drop with 24.11 - services.archisteamfarm.dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf"); + services.archisteamfarm = { + # TODO: drop with 24.11 + dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf"); + settings.IPC = lib.mkIf (!cfg.web-ui.enable) false; + }; users = { users.archisteamfarm = { From 3c670621db84317d10f458f3e6453fc133fc3bfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 00:30:00 +0000 Subject: [PATCH 075/311] shotman: 0.4.5 -> 0.4.6 --- pkgs/tools/wayland/shotman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix index 08de35f14d3f..cd5bec87526e 100644 --- a/pkgs/tools/wayland/shotman/default.nix +++ b/pkgs/tools/wayland/shotman/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "shotman"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromSourcehut { owner = "~whynothugo"; repo = pname; rev = "v${version}"; - hash = "sha256-SctWNhYCFTAOOnDEcsFZH61+QQAcmup11GVVXA1U5Dw="; + hash = "sha256-OmYCeB2szWmFJQ+MXWmVI7IzeXgbix9ZK4/4kgR5S6A="; }; - cargoHash = "sha256-q5scdgfB5NgtjAgnIy/+c+y/mymF0b9ZZSz2LmM0pfw="; + cargoHash = "sha256-Kq2uq171B+4WzEJauH19/nzkm2irM4ggoFfxlARfyEg="; nativeBuildInputs = [ pkg-config makeWrapper ]; From dd928b508c14032580665423d02652bf53ba44a6 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 20 May 2024 22:55:46 -0400 Subject: [PATCH 076/311] waylock: 1.0.0 -> 1.1.0 Changelog: https://codeberg.org/ifreund/waylock/releases/tag/v1.1.0 --- pkgs/by-name/wa/waylock/build.zig.zon.nix | 20 +++++++++++ pkgs/by-name/wa/waylock/package.nix | 41 ++++++++++++++--------- pkgs/by-name/wa/waylock/update.nu | 5 ++- 3 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 pkgs/by-name/wa/waylock/build.zig.zon.nix diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix new file mode 100644 index 000000000000..a0d4d9ac0971 --- /dev/null +++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix @@ -0,0 +1,20 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz"; + hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg="; + }; + } + { + name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz"; + hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA="; + }; + } +] diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix index 9ed2cc12131e..a4b8facf555d 100644 --- a/pkgs/by-name/wa/waylock/package.nix +++ b/pkgs/by-name/wa/waylock/package.nix @@ -1,18 +1,20 @@ -{ lib -, stdenv -, fetchFromGitea -, libxkbcommon -, pam -, pkg-config -, scdoc -, wayland -, wayland-protocols -, zig_0_11 +{ + lib, + stdenv, + callPackage, + fetchFromGitea, + libxkbcommon, + pam, + pkg-config, + scdoc, + wayland, + wayland-protocols, + zig_0_12, }: stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; @@ -20,14 +22,16 @@ stdenv.mkDerivation (finalAttrs: { repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0="; + hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA="; }; + deps = callPackage ./build.zig.zon.nix { }; + nativeBuildInputs = [ pkg-config scdoc wayland - zig_0_11.hook + zig_0_12.hook ]; buildInputs = [ @@ -36,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: { pam ]; - zigBuildFlags = [ "-Dman-pages" ]; + zigBuildFlags = [ + "-Dman-pages" + "--system" + "${finalAttrs.deps}" + ]; passthru.updateScript = ./update.nu; @@ -45,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}"; description = "A small screenlocker for Wayland compositors"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ]; + maintainers = with lib.maintainers; [ + adamcstephens + jordanisaacs + ]; mainProgram = "waylock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/wa/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu index 514a755db1a3..e227fb646517 100755 --- a/pkgs/by-name/wa/waylock/update.nu +++ b/pkgs/by-name/wa/waylock/update.nu @@ -1,5 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts +#!nix-shell -i nu -p nushell common-updater-scripts zon2nix let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last update-source-version waylock $latest_tag + +http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon +zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix From f192a3fe9590713abee64d28052fd0dfc0c31e0d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 May 2024 03:57:49 +0200 Subject: [PATCH 077/311] physac: init at 2.5-unstable-2024-05-21 physac: fix --- pkgs/by-name/ph/physac/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/ph/physac/package.nix diff --git a/pkgs/by-name/ph/physac/package.nix b/pkgs/by-name/ph/physac/package.nix new file mode 100644 index 000000000000..292d5ce6bd24 --- /dev/null +++ b/pkgs/by-name/ph/physac/package.nix @@ -0,0 +1,47 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + name = "physac"; + version = "2.5-unstable-2023-12-11"; + + src = fetchFromGitHub { + owner = "victorfisac"; + repo = "Physac"; + rev = "29d9fc06860b54571a02402fff6fa8572d19bd12"; + hash = "sha256-PTlV1tT0axQbmGmJ7JD1n6wmbIxUdu7xho78EO0HNNk="; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/{include,lib/pkgconfig} + + install -Dm644 $src/src/physac.h $out/include/physac.h + + cat < $out/lib/pkgconfig/physac.pc + prefix=$out + includedir=$out/include + + Name: physac + Description: ${finalAttrs.meta.description} + URL: ${finalAttrs.meta.homepage} + Version: ${finalAttrs.version} + Cflags: -I"{includedir}" + EOF + + runHook postInstall + ''; + + meta = { + description = "2D physics header-only library for raylib"; + homepage = "https://github.com/victorfisac/Physac"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.unix; + }; +}) From 356e13a00c071ae85a0140a443da9da4bc567961 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 May 2024 03:59:04 +0200 Subject: [PATCH 078/311] raygui: init at unstable 4.0-unstalble-2024-05-21 fix raygui platforms raygui: fix --- pkgs/by-name/ra/raygui/package.nix | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/ra/raygui/package.nix diff --git a/pkgs/by-name/ra/raygui/package.nix b/pkgs/by-name/ra/raygui/package.nix new file mode 100644 index 000000000000..3c5b427e828f --- /dev/null +++ b/pkgs/by-name/ra/raygui/package.nix @@ -0,0 +1,47 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + name = "raygui"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "raysan5"; + repo = "raygui"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-1qnChZYsb0e5LnPhvs6a/R5Ammgj2HWFNe9625sBRo8="; + }; + + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/{include,lib/pkgconfig} + + install -Dm644 $src/src/raygui.h $out/include/raygui.h + + cat < $out/lib/pkgconfig/raygui.pc + prefix=$out + includedir=$out/include + + Name: raygui + Description: ${finalAttrs.meta.description} + URL: ${finalAttrs.meta.homepage} + Version: ${finalAttrs.version} + Cflags: -I"{includedir}" + EOF + + runHook postInstall + ''; + + meta = { + description = "A simple and easy-to-use immediate-mode gui library"; + homepage = "https://github.com/raysan5/raygui"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.unix; + }; +}) From 7d0aaba0cddc0d650e22b69e61aec4491cb1f709 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 21 May 2024 03:59:57 +0200 Subject: [PATCH 079/311] raylib-python-cffi: init at 5.0.0.2 --- .../raylib-python-cffi/default.nix | 57 +++++++++++++++++ .../fix_pyray_builder.patch | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 120 insertions(+) create mode 100644 pkgs/development/python-modules/raylib-python-cffi/default.nix create mode 100644 pkgs/development/python-modules/raylib-python-cffi/fix_pyray_builder.patch diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix new file mode 100644 index 000000000000..f1d46c1822d1 --- /dev/null +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -0,0 +1,57 @@ +{ + buildPythonPackage, + fetchFromGitHub, + setuptools, + cffi, + pkg-config, + glfw, + libffi, + raylib, + physac, + raygui, + lib +}: + +buildPythonPackage rec { + pname = "raylib-python-cffi"; + version = "5.0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "electronstudio"; + repo = "raylib-python-cffi"; + rev = "refs/tags/v${version}"; + hash = "sha256-DlnZRJZ0ZnkLii09grA/lGsJHPUYrbaJ55BVWJ8JzfM="; + }; + + build-system = [ setuptools ]; + dependencies = [ cffi ]; + + patches = [ + # This patch fixes to the builder script function to call pkg-config + # using the library name rather than searching only through raylib + ./fix_pyray_builder.patch + ]; + + nativeBuildInputs = [ pkg-config ]; + + # tests require a graphic environment + doCheck = false; + + pythonImportsCheck = [ "pyray" ]; + + buildInputs = [ + glfw + libffi + raylib + physac + raygui + ]; + + meta = { + description = "Python CFFI bindings for Raylib"; + homepage = "https://electronstudio.github.io/raylib-python-cffi"; + license = lib.licenses.epl20; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/development/python-modules/raylib-python-cffi/fix_pyray_builder.patch b/pkgs/development/python-modules/raylib-python-cffi/fix_pyray_builder.patch new file mode 100644 index 000000000000..0d167e2b0795 --- /dev/null +++ b/pkgs/development/python-modules/raylib-python-cffi/fix_pyray_builder.patch @@ -0,0 +1,61 @@ +--- a/raylib/build.py 2024-05-18 18:36:26.911488056 +0200 ++++ b/raylib/build.py 2024-05-18 18:40:04.770587090 +0200 +@@ -32,8 +32,8 @@ + return subprocess.run(['pkg-config', '--exists', 'raylib'], text=True, stdout=subprocess.PIPE).returncode == 0 + + +-def get_the_include_path(): +- return subprocess.run(['pkg-config', '--variable=includedir', 'raylib'], text=True, ++def get_the_include_path(libname): ++ return subprocess.run(['pkg-config', '--variable=includedir', libname], text=True, + stdout=subprocess.PIPE).stdout.strip() + + +@@ -106,9 +106,9 @@ + if not check_raylib_installed(): + raise Exception("ERROR: raylib not found by pkg-config. Please install pkg-config and Raylib.") + +- raylib_h = get_the_include_path() + "/raylib.h" +- rlgl_h = get_the_include_path() + "/rlgl.h" +- raymath_h = get_the_include_path() + "/raymath.h" ++ raylib_h = get_the_include_path("raylib") + "/raylib.h" ++ rlgl_h = get_the_include_path("raylib") + "/rlgl.h" ++ raymath_h = get_the_include_path("raylib") + "/raymath.h" + + if not os.path.isfile(raylib_h): + raise Exception("ERROR: " + raylib_h + " not found. Please install Raylib.") +@@ -125,13 +125,13 @@ + #include "raymath.h" + """ + +- glfw3_h = get_the_include_path() + "/GLFW/glfw3.h" ++ glfw3_h = get_the_include_path("glfw3") + "/GLFW/glfw3.h" + if check_header_exists(glfw3_h): + ffi_includes += """ + #include "GLFW/glfw3.h" + """ + +- raygui_h = get_the_include_path() + "/raygui.h" ++ raygui_h = get_the_include_path("raygui") + "/raygui.h" + if check_header_exists(raygui_h): + ffi_includes += """ + #define RAYGUI_IMPLEMENTATION +@@ -139,7 +139,7 @@ + #include "raygui.h" + """ + +- physac_h = get_the_include_path() + "/physac.h" ++ physac_h = get_the_include_path("physac") + "/physac.h" + if check_header_exists(physac_h): + ffi_includes += """ + #define PHYSAC_IMPLEMENTATION +@@ -172,7 +172,7 @@ + + ffibuilder.set_source("raylib._raylib_cffi", + ffi_includes, +- include_dirs=[get_the_include_path()], ++ include_dirs=[get_the_include_path("libffi")], + extra_link_args=extra_link_args, + extra_compile_args=extra_compile_args, + libraries=libraries) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5683ca178c1..68976eb48ed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13036,6 +13036,8 @@ self: super: with self; { ray = callPackage ../development/python-modules/ray { }; + raylib-python-cffi = callPackage ../development/python-modules/raylib-python-cffi {}; + razdel = callPackage ../development/python-modules/razdel { }; rbtools = callPackage ../development/python-modules/rbtools { }; From 146bffe5aa6c6f8ea7d280ca85f4cbf239fb9751 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 7 Apr 2024 20:32:41 -0400 Subject: [PATCH 080/311] nixos/systemd-resolved: Re-indent --- nixos/modules/system/boot/resolved.nix | 89 +++++++++++++------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 64a15179438f..6006ed7894c9 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -128,58 +128,61 @@ in }; - config = mkIf cfg.enable { + config = mkMerge [ + (mkIf cfg.enable { - assertions = [ - { assertion = !config.networking.useHostResolvConf; - message = "Using host resolv.conf is not supported with systemd-resolved"; - } - ]; + assertions = [ + { assertion = !config.networking.useHostResolvConf; + message = "Using host resolv.conf is not supported with systemd-resolved"; + } + ]; - users.users.systemd-resolve.group = "systemd-resolve"; + users.users.systemd-resolve.group = "systemd-resolve"; - # add resolve to nss hosts database if enabled and nscd enabled - # system.nssModules is configured in nixos/modules/system/boot/systemd.nix - # added with order 501 to allow modules to go before with mkBefore - system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]); + # add resolve to nss hosts database if enabled and nscd enabled + # system.nssModules is configured in nixos/modules/system/boot/systemd.nix + # added with order 501 to allow modules to go before with mkBefore + system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]); - systemd.additionalUpstreamSystemUnits = [ - "systemd-resolved.service" - ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-resolved.service" + ]; - systemd.services.systemd-resolved = { - wantedBy = [ "multi-user.target" ]; - aliases = [ "dbus-org.freedesktop.resolve1.service" ]; - restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; - }; + systemd.services.systemd-resolved = { + wantedBy = [ "multi-user.target" ]; + aliases = [ "dbus-org.freedesktop.resolve1.service" ]; + restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; + }; - environment.etc = { - "systemd/resolved.conf".text = '' - [Resolve] - ${optionalString (config.networking.nameservers != []) - "DNS=${concatStringsSep " " config.networking.nameservers}"} - ${optionalString (cfg.fallbackDns != null) - "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} - ${optionalString (cfg.domains != []) - "Domains=${concatStringsSep " " cfg.domains}"} - LLMNR=${cfg.llmnr} - DNSSEC=${cfg.dnssec} - DNSOverTLS=${cfg.dnsovertls} - ${config.services.resolved.extraConfig} - ''; + environment.etc = { + "systemd/resolved.conf".text = '' + [Resolve] + ${optionalString (config.networking.nameservers != []) + "DNS=${concatStringsSep " " config.networking.nameservers}"} + ${optionalString (cfg.fallbackDns != null) + "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} + ${optionalString (cfg.domains != []) + "Domains=${concatStringsSep " " cfg.domains}"} + LLMNR=${cfg.llmnr} + DNSSEC=${cfg.dnssec} + DNSOverTLS=${cfg.dnsovertls} + ${config.services.resolved.extraConfig} + ''; - # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: - # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf - "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; - } // optionalAttrs dnsmasqResolve { - "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; - }; + # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: + # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf + "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf"; + } // optionalAttrs dnsmasqResolve { + "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + }; - # If networkmanager is enabled, ask it to interface with resolved. - networking.networkmanager.dns = "systemd-resolved"; + # If networkmanager is enabled, ask it to interface with resolved. + networking.networkmanager.dns = "systemd-resolved"; - networking.resolvconf.package = pkgs.systemd; + networking.resolvconf.package = pkgs.systemd; - }; + }) + + ]; } From 154459858f661487e543ce5d1a2a3d37b9638da6 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 7 Apr 2024 20:33:13 -0400 Subject: [PATCH 081/311] nixos/systemd-resolved: Should be wanted by sysinit.target As per its [Install] section upstream --- nixos/modules/system/boot/resolved.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 6006ed7894c9..2c9a7ddee4f6 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -149,7 +149,7 @@ in ]; systemd.services.systemd-resolved = { - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "sysinit.target" ]; aliases = [ "dbus-org.freedesktop.resolve1.service" ]; restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; }; From 9231977e8649c5ce70e6924df98652538fa82e70 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 20 May 2024 19:37:01 -0400 Subject: [PATCH 082/311] nixos/tests: systemd-resolved --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-resolved.nix | 60 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 nixos/tests/systemd-resolved.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 10daa1bbf6d2..2b715a356843 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -929,6 +929,7 @@ in { systemd-oomd = handleTest ./systemd-oomd.nix {}; systemd-portabled = handleTest ./systemd-portabled.nix {}; systemd-repart = handleTest ./systemd-repart.nix {}; + systemd-resolved = handleTest ./systemd-resolved.nix {}; systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-sysupdate = runTest ./systemd-sysupdate.nix; systemd-sysusers-mutable = runTest ./systemd-sysusers-mutable.nix; diff --git a/nixos/tests/systemd-resolved.nix b/nixos/tests/systemd-resolved.nix new file mode 100644 index 000000000000..64630b3e9909 --- /dev/null +++ b/nixos/tests/systemd-resolved.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "systemd-resolved"; + meta.maintainers = [ lib.maintainers.elvishjerricco ]; + + nodes.server = { lib, config, ... }: let + exampleZone = pkgs.writeTextDir "example.com.zone" '' + @ SOA ns.example.com. noc.example.com. 2019031301 86400 7200 3600000 172800 + @ A ${(lib.head config.networking.interfaces.eth1.ipv4.addresses).address} + @ AAAA ${(lib.head config.networking.interfaces.eth1.ipv6.addresses).address} + ''; + in { + networking.firewall.enable = false; + networking.useDHCP = false; + + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd00::1"; prefixLength = 64; } + ]; + + services.knot = { + enable = true; + settings = { + server.listen = [ + "0.0.0.0@53" + "::@53" + ]; + template.default.storage = exampleZone; + zone."example.com".file = "example.com.zone"; + }; + }; + }; + + nodes.client = { nodes, ... }: let + inherit (lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses) address; + in { + networking.nameservers = [ address ]; + networking.interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "fd00::2"; prefixLength = 64; } + ]; + services.resolved.enable = true; + services.resolved.fallbackDns = [ ]; + networking.useNetworkd = true; + networking.useDHCP = false; + systemd.network.networks."40-eth0".enable = false; + }; + + testScript = { nodes, ... }: let + address4 = (lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address; + address6 = (lib.head nodes.server.networking.interfaces.eth1.ipv6.addresses).address; + in '' + start_all() + server.wait_for_unit("multi-user.target") + client.wait_for_unit("multi-user.target") + + query = client.succeed("resolvectl query example.com") + assert "${address4}" in query + assert "${address6}" in query + client.succeed("ping -4 -c 1 example.com") + client.succeed("ping -6 -c 1 example.com") + ''; +}) From 10cadef0276b92a88cc7293cc2911ae59378fe84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 17 May 2024 19:49:27 +0200 Subject: [PATCH 083/311] hedgedoc: fix executing scripts, delete unused setup script --- pkgs/servers/web-apps/hedgedoc/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 1992c14270e7..7e1c7644fb01 100644 --- a/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -55,6 +55,10 @@ in stdenv.mkDerivation { python3 # needed for sqlite node-gyp ]; + buildInputs = [ + nodejs + ]; + dontConfigure = true; buildPhase = '' @@ -75,7 +79,8 @@ in stdenv.mkDerivation { yarn --immutable-cache yarn run build - rm bin/heroku + # Delete scripts that are not useful for NixOS + rm bin/{heroku,setup} patchShebangs bin/* runHook postBuild @@ -85,11 +90,10 @@ in stdenv.mkDerivation { runHook preInstall mkdir -p $out/share/hedgedoc - cp -r bin $out - cp -r {app.js,lib,locales,node_modules,package.json,public} $out/share/hedgedoc + cp -r {app.js,bin,lib,locales,node_modules,package.json,public} $out/share/hedgedoc - for bin in $out/bin/*; do - wrapProgram $bin \ + for bin in $out/share/hedgedoc/bin/*; do + makeWrapper $bin $out/bin/$(basename $bin) \ --set NODE_ENV production \ --set NODE_PATH "$out/share/hedgedoc/lib/node_modules" done From e8bf617348232374c28d20d29c80e6d6cf414a85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 13:18:36 +0000 Subject: [PATCH 084/311] fluent-bit: 3.0.3 -> 3.0.4 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 86ae31ba214d..8784aab978f1 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-nlBzD9u7DsCbJq9FxsbsP8F/tPklZ43NV8T2eiwWE24="; + hash = "sha256-XMfUMyoI2mK0imvz/5HTO8CHyKubyPGSTN69v79fkjg="; }; nativeBuildInputs = [ cmake flex bison ]; From 7ea6c1ec81bbb7ad4767ef73de70fe9e2244a0c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 13:19:27 +0000 Subject: [PATCH 085/311] kotlin: 1.9.24 -> 2.0.0 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 68b648846ea4..b8967d64794f 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.9.24"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-63to4BAp+me8jQYO5UwSAY8sYN3EOM8h2xRRcimqaTs="; + sha256 = "sha256-71eHMJdhVP0sWWjXWvjCcDs96Ep43/6RP2cDJuFJ2js="; }; propagatedBuildInputs = [ jre ] ; From 74e397ecf028da2ad33b14baba99800522f926a9 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Tue, 21 May 2024 21:03:45 +0800 Subject: [PATCH 086/311] dae: 0.4.0 -> 0.6.0rc2 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 0c95db7e3af1..4597ac476863 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.4.0"; + version = "0.6.0rc2"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-hvAuWCacaWxXwxx5ktj57hnWt8fcnwD6rUuRj1+ZtFA="; + hash = "sha256-u+1DkcdXXm/wmKG7yu8nv3OOeG/l5KC+9UcIrYOmsUA="; fetchSubmodules = true; }; - vendorHash = "sha256-4U6zIxK8K+MGxRboTtsKntDMp8/cQWPqXQ3l03AEtBs="; + vendorHash = "sha256-jJbXa3xnQXhEhrhmdi+JqdinLuRrFY5Tb9lsnCancFE="; proxyVendor = true; From a7440c78739f6d379c580e61b02fed4fa7f3586c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 18 Apr 2024 20:38:43 +0200 Subject: [PATCH 087/311] ayatana-indicator-sound: init at 24.4.0 --- nixos/tests/ayatana-indicators.nix | 3 + .../ay/ayatana-indicator-sound/package.nix | 125 ++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 pkgs/by-name/ay/ayatana-indicator-sound/package.nix diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 13a0982a142b..1ca3e1dda3d3 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -31,6 +31,7 @@ in { ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session + ayatana-indicator-sound ] ++ (with pkgs.lomiri; [ lomiri-indicator-network telephony-service @@ -41,6 +42,8 @@ in { services.accounts-daemon.enable = true; # messages + hardware.pulseaudio.enable = true; # sound + # Lomiri-ish setup for Lomiri indicators # TODO move into a Lomiri module, once the package set is far enough for the DE to start diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix new file mode 100644 index 000000000000..84d2d8c3bfc9 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -0,0 +1,125 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, nixosTests +, accountsservice +, cmake +, dbus +, dbus-test-runner +, glib +, gobject-introspection +, gtest +, intltool +, libayatana-common +, libgee +, libnotify +, libpulseaudio +, libqtdbusmock +, libqtdbustest +, libsForQt5 +, libxml2 +, lomiri +, pkg-config +, python3 +, systemd +, vala +, wrapGAppsHook3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-sound"; + version = "24.4.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-sound"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-2B2CFUjDvBpZ8R4fnGDViS3pXO1L0kP1tnJCtqKeLaQ="; + }; + + postPatch = '' + # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'DESTINATION "/etc' 'DESTINATION "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' + + # Build-time Vala codegen + substituteInPlace src/CMakeLists.txt \ + --replace-fail '/usr/share/gir-1.0/AccountsService-1.0.gir' '${lib.getDev accountsservice}/share/gir-1.0/AccountsService-1.0.gir' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gobject-introspection + intltool + libpulseaudio # vala files(?) + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + accountsservice + glib + gobject-introspection + libayatana-common + libgee + libnotify + libpulseaudio + libxml2 + systemd + ] ++ (with lomiri; [ + cmake-extras + lomiri-api + lomiri-schemas + ]); + + nativeCheckInputs = [ + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + dbus-test-runner + gtest + libsForQt5.qtbase + libqtdbusmock + libqtdbustest + lomiri.gmenuharness + ]; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_LOMIRI_FEATURES" true) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + dontWrapQtApps = true; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + ayatana-indicators = [ "ayatana-indicator-sound" ]; + tests.vm = nixosTests.ayatana-indicators; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Ayatana Indicator for managing system sound"; + longDescription = '' + Ayatana Indicator Sound that provides easy control of the PulseAudio + sound daemon. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-sound"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-sound/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) From af545969b68d0140ea6f68fb89d76e2e550d5e60 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 21 May 2024 16:15:23 +0200 Subject: [PATCH 088/311] nixos/lomiri: Add sound indicator --- nixos/modules/services/desktop-managers/lomiri.nix | 3 +++ nixos/tests/lomiri.nix | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 0a1b86096e76..d16c3c750da6 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -38,6 +38,7 @@ in { ]); }; + hardware.pulseaudio.enable = lib.mkDefault true; networking.networkmanager.enable = lib.mkDefault true; systemd.packages = with pkgs.lomiri; [ @@ -74,6 +75,8 @@ in { ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session + ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ + ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ telephony-service ] ++ lib.optionals config.networking.networkmanager.enable [ diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 3f20aae44135..b0be3baa20fb 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -290,7 +290,7 @@ in { # There's a test app we could use that also displays their contents, but it's abit inconsistent. with subtest("ayatana indicators work"): mouse_click(735, 0) # the cog in the top-right, for the session indicator - machine.wait_for_text(r"(Notifications|Battery|Time|Date|System)") + machine.wait_for_text(r"(Notifications|Battery|Sound|Time|Date|System)") machine.screenshot("indicators_open") # Indicator order within the menus *should* be fixed based on per-indicator order setting @@ -298,6 +298,7 @@ in { machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there with subtest("lomiri indicator network works"): @@ -305,6 +306,11 @@ in { machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") + with subtest("lomiri indicator sound works"): + machine.send_key("right") + machine.wait_for_text(r"(Silent|Volume)") + machine.screenshot("indicators_sound") + with subtest("ayatana indicator power works"): machine.send_key("right") machine.wait_for_text(r"(Charge|Battery settings)") From 4c626c52b7e07d1827d4a84228d372359791bc22 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 20 May 2024 12:10:14 +0200 Subject: [PATCH 089/311] nixos/tests/stalwart-mail: Add test for server version >= 0.7 --- nixos/tests/stalwart-mail.nix | 227 +++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 101 deletions(-) diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart-mail.nix index 581090cd70f4..4075b32e2c1f 100644 --- a/nixos/tests/stalwart-mail.nix +++ b/nixos/tests/stalwart-mail.nix @@ -1,122 +1,147 @@ # Rudimentary test checking that the Stalwart email server can: # - receive some message through SMTP submission, then # - serve this message through IMAP. +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, + lib ? pkgs.lib, +}: let certs = import ./common/acme/server/snakeoil-certs.nix; domain = certs.domain; + makeTest = import ./make-test-python.nix; + mkTestName = + pkg: "${pkg.pname}_${pkg.version}"; + stalwartPackages = { + inherit (pkgs) stalwart-mail_0_6 stalwart-mail; + }; + stalwartAtLeast = lib.versionAtLeast; + makeStalwartTest = + { + package, + name ? mkTestName package, + }: + makeTest { + inherit name; + meta.maintainers = with lib.maintainers; [ + happysalada pacien onny + ]; -in import ./make-test-python.nix ({ lib, ... }: { - name = "stalwart-mail"; + nodes.machine = { lib, ... }: { - nodes.main = { pkgs, ... }: { - security.pki.certificateFiles = [ certs.ca.cert ]; + security.pki.certificateFiles = [ certs.ca.cert ]; - services.stalwart-mail = { - enable = true; - settings = { - server.hostname = domain; - - certificate."snakeoil" = { - cert = "file://${certs.${domain}.cert}"; - private-key = "file://${certs.${domain}.key}"; - }; - - server.tls = { - certificate = "snakeoil"; + services.stalwart-mail = { enable = true; - implicit = false; - }; + inherit package; + settings = { + server.hostname = domain; - server.listener = { - "smtp-submission" = { - bind = [ "[::]:587" ]; - protocol = "smtp"; - }; + # TODO: Remove backwards compatibility as soon as we drop legacy version 0.6.0 + certificate."snakeoil" = let + certPath = if stalwartAtLeast package.version "0.7.0" then "%{file://${certs.${domain}.cert}}%" else "file://${certs.${domain}.cert}"; + keyPath = if stalwartAtLeast package.version "0.7.0" then "%{file:${certs.${domain}.key}}%" else "file://${certs.${domain}.key}"; + in { + cert = certPath; + private-key = keyPath; + }; - "imap" = { - bind = [ "[::]:143" ]; - protocol = "imap"; + server.tls = { + certificate = "snakeoil"; + enable = true; + implicit = false; + }; + + server.listener = { + "smtp-submission" = { + bind = [ "[::]:587" ]; + protocol = "smtp"; + }; + + "imap" = { + bind = [ "[::]:143" ]; + protocol = "imap"; + }; + }; + + session.auth.mechanisms = "[plain]"; + session.auth.directory = "'in-memory'"; + storage.directory = "in-memory"; + + session.rcpt.directory = "'in-memory'"; + queue.outbound.next-hop = "'local'"; + + directory."in-memory" = { + type = "memory"; + # TODO: Remove backwards compatibility as soon as we drop legacy version 0.6.0 + principals = let + condition = if stalwartAtLeast package.version "0.7.0" then "class" else "type"; + in builtins.map (p: p // { ${condition} = "individual"; }) [ + { + name = "alice"; + secret = "foobar"; + email = [ "alice@${domain}" ]; + } + { + name = "bob"; + secret = "foobar"; + email = [ "bob@${domain}" ]; + } + ]; + }; }; }; - resolver.public-suffix = [ ]; # do not fetch from web in sandbox + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "test-smtp-submission" { } '' + from smtplib import SMTP - session.auth.mechanisms = "[plain]"; - session.auth.directory = "'in-memory'"; - storage.directory = "in-memory"; + with SMTP('localhost', 587) as smtp: + smtp.starttls() + smtp.login('alice', 'foobar') + smtp.sendmail( + 'alice@${domain}', + 'bob@${domain}', + """ + From: alice@${domain} + To: bob@${domain} + Subject: Some test message - session.rcpt.directory = "'in-memory'"; - queue.outbound.next-hop = "'local'"; + This is a test message. + """.strip() + ) + '') + + (pkgs.writers.writePython3Bin "test-imap-read" { } '' + from imaplib import IMAP4 + + with IMAP4('localhost') as imap: + imap.starttls() + status, [caps] = imap.login('bob', 'foobar') + assert status == 'OK' + imap.select() + status, [ref] = imap.search(None, 'ALL') + assert status == 'OK' + [msgId] = ref.split() + status, msg = imap.fetch(msgId, 'BODY[TEXT]') + assert status == 'OK' + assert msg[0][1].strip() == b'This is a test message.' + '') + ]; - directory."in-memory" = { - type = "memory"; - principals = [ - { - type = "individual"; - name = "alice"; - secret = "foobar"; - email = [ "alice@${domain}" ]; - } - { - type = "individual"; - name = "bob"; - secret = "foobar"; - email = [ "bob@${domain}" ]; - } - ]; - }; }; + + testScript = '' + start_all() + machine.wait_for_unit("stalwart-mail.service") + machine.wait_for_open_port(587) + machine.wait_for_open_port(143) + + machine.succeed("test-smtp-submission") + machine.succeed("test-imap-read") + ''; }; - - environment.systemPackages = [ - (pkgs.writers.writePython3Bin "test-smtp-submission" { } '' - from smtplib import SMTP - - with SMTP('localhost', 587) as smtp: - smtp.starttls() - smtp.login('alice', 'foobar') - smtp.sendmail( - 'alice@${domain}', - 'bob@${domain}', - """ - From: alice@${domain} - To: bob@${domain} - Subject: Some test message - - This is a test message. - """.strip() - ) - '') - - (pkgs.writers.writePython3Bin "test-imap-read" { } '' - from imaplib import IMAP4 - - with IMAP4('localhost') as imap: - imap.starttls() - status, [caps] = imap.login('bob', 'foobar') - assert status == 'OK' - imap.select() - status, [ref] = imap.search(None, 'ALL') - assert status == 'OK' - [msgId] = ref.split() - status, msg = imap.fetch(msgId, 'BODY[TEXT]') - assert status == 'OK' - assert msg[0][1].strip() == b'This is a test message.' - '') - ]; - }; - - testScript = /* python */ '' - main.wait_for_unit("stalwart-mail.service") - main.wait_for_open_port(587) - main.wait_for_open_port(143) - - main.succeed("test-smtp-submission") - main.succeed("test-imap-read") - ''; - - meta = { - maintainers = with lib.maintainers; [ happysalada pacien ]; - }; -}) +in +lib.mapAttrs (_: package: makeStalwartTest { inherit package; }) stalwartPackages From 2c4128ea01c48cdd3e0adce10aaffd7c44495ea7 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 21 May 2024 21:06:46 +0200 Subject: [PATCH 090/311] nixos/stalwart-mail: use publicsuffix-list package Co-authored-by: shawn8901 --- nixos/modules/services/mail/stalwart-mail.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index c69a2ca400ba..06b48c86907c 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -70,7 +70,9 @@ in { storage.lookup = mkDefault "db"; storage.blob = mkDefault "blob"; resolver.type = mkDefault "system"; - resolver.public-suffix = mkDefault ["https://publicsuffix.org/list/public_suffix_list.dat"]; + resolver.public-suffix = lib.mkDefault [ + "file://${pkgs.publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" + ]; }; systemd.services.stalwart-mail = { From 78ef0a386ec264bf2c6f2389a9da21e74c674d84 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Tue, 21 May 2024 22:10:54 +0200 Subject: [PATCH 091/311] python312Packages.webssh: fix test case --- .../python-modules/webssh/default.nix | 9 ++++----- .../webssh/remove-typo-in-test-case.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index 4681b186c9ca..0bfa6a525d31 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-mRestRJukaf7ti3vIs/MM/R+zpGmK551j5HAM2chBsE="; }; + patches = [ + ./remove-typo-in-test-case.patch + ]; + propagatedBuildInputs = [ paramiko tornado @@ -30,11 +34,6 @@ buildPythonPackage rec { "webssh" ]; - disabledTests = [ - # Test fails with AttributeError (possibly related to paramiko update) - "test_app_with_bad_host_key" - ]; - meta = with lib; { description = "Web based SSH client"; mainProgram = "wssh"; diff --git a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch new file mode 100644 index 000000000000..ac7bd94e5b39 --- /dev/null +++ b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch @@ -0,0 +1,18 @@ +--- + tests/test_handler.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_handler.py b/tests/test_handler.py +index a9ad924..950e672 100644 +--- a/tests/test_handler.py ++++ b/tests/test_handler.py +@@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase): + ssh.exec_command.return_value = (stdin, stdout, stderr) + + encoding = IndexHandler.get_default_encoding(handler, ssh) +- self.assertEquals("utf-8", encoding) ++ self.assertEqual("utf-8", encoding) + +-- +2.44.0 + From 31c78cbfe6e22864ce1edf47b398ce5b92989c6a Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Fri, 17 May 2024 15:59:42 +0200 Subject: [PATCH 092/311] imgbrd-grabber: 7.10.0 -> 7.12.2 --- .../im/imgbrd-grabber/package.nix} | 102 +++++++++--------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 51 insertions(+), 53 deletions(-) rename pkgs/{applications/graphics/imgbrd-grabber/default.nix => by-name/im/imgbrd-grabber/package.nix} (58%) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/by-name/im/imgbrd-grabber/package.nix similarity index 58% rename from pkgs/applications/graphics/imgbrd-grabber/default.nix rename to pkgs/by-name/im/imgbrd-grabber/package.nix index 72d9d9cc1e01..a3f083633bbe 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/by-name/im/imgbrd-grabber/package.nix @@ -1,77 +1,74 @@ -{ lib -, stdenv -, cmake -, fetchFromGitHub -, wrapQtAppsHook -, qtmultimedia -, qttools -, qtdeclarative -, qtnetworkauth -, qtbase -, makeWrapper -, catch2 -, nodejs -, libpulseaudio -, openssl -, rsync -, typescript +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + makeWrapper, + catch2, + nodejs, + libpulseaudio, + openssl, + rsync, + typescript, + qt6, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgbrd-grabber"; - version = "7.10.0"; + version = "7.12.2"; src = fetchFromGitHub { owner = "Bionus"; repo = "imgbrd-grabber"; - rev = "v${version}"; - sha256 = "sha256-AT6pN2do0LlH6xAXKcFQv+oderD88/EiG1JnCw6kOOg="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6XfIaASfbvdPovtdDEJtsk4pEL4Dhmyq8ml4X7KZ4DE="; fetchSubmodules = true; }; - buildInputs = [ - openssl - libpulseaudio - typescript - ]; + buildInputs = + with qt6; + [ + qtbase + qtdeclarative + qttools + qtnetworkauth + qtmultimedia + ] + ++ [ + openssl + libpulseaudio + typescript + nodejs + ]; nativeBuildInputs = [ makeWrapper - qtmultimedia - qtbase - qtdeclarative - qttools - qtnetworkauth - nodejs + qt6.wrapQtAppsHook cmake - wrapQtAppsHook ]; extraOutputsToLink = [ "doc" ]; - postPatch = '' + preBuild = '' + export HOME=$TMPDIR + # the package.sh script provides some install helpers # using this might make it easier to maintain/less likely for the # install phase to fail across version bumps - patchShebangs ./scripts/package.sh + patchShebangs ../scripts/package.sh + ''; + + postPatch = '' # ensure the script uses the rsync package from nixpkgs - substituteInPlace ../scripts/package.sh --replace "rsync" "${rsync}/bin/rsync" + substituteInPlace ../scripts/package.sh --replace-fail "rsync" "${lib.getExe rsync}" # the npm build step only runs typescript # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc. - substituteInPlace ./sites/CMakeLists.txt --replace "npm install" "npm run build" - - # remove the vendored catch2 - rm -rf tests/src/vendor/catch + substituteInPlace ./sites/CMakeLists.txt --replace-fail "npm install" "npm run build" # link the catch2 sources from nixpkgs - ln -sf ${catch2.src} tests/src/vendor/catch - ''; - - preBuild = '' - export HOME=$TMPDIR + ln -sf ${catch2.src} tests/src/ ''; postInstall = '' @@ -88,13 +85,16 @@ stdenv.mkDerivation rec { ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli ''; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; - meta = with lib; { + meta = { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://bionus.github.io/imgbrd-grabber/"; mainProgram = "Grabber"; - maintainers = [ maintainers.evanjs ]; + maintainers = with lib.maintainers; [ + evanjs + luftmensch-luftmensch + ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 160b65391fea..1b665ba936db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31925,8 +31925,6 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; - imgcat = callPackage ../applications/graphics/imgcat { }; img-cat = callPackage ../applications/graphics/img-cat { }; From 0e64e645c92333257fa9bc78cbe31675c715533b Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 9 Jan 2024 13:13:08 +0300 Subject: [PATCH 093/311] buildDotnetModule: fix cross-compilation and remove dotnet-test-sdk This change fixes cross-compilation for .NET packages (that are not using .sln as project files). See relevant comment in the change list for more details. In addition to that, it removes dotnet-test-sdk that appears to be broken, that is, dotnet --list-sdks does not recognize SDKs from PATH, and when propagated from the check hook it was shadowed by inputs from preceding hooks. Note that dotnet-test-sdk used to work when it was introduced in PR 144062, but PR 155257 probably overlooked this case. However, currently it is not used in Nixpkgs and I think dotnetCorePackages.combinePackages should cover the intended use case for dotnet-test-sdk. --- doc/languages-frameworks/dotnet.section.md | 1 - pkgs/build-support/dotnet/build-dotnet-module/default.nix | 4 +--- .../dotnet/build-dotnet-module/hooks/default.nix | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index a4e9d6cf9a6c..36c20a9e9c50 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -117,7 +117,6 @@ For more detail about managing the `deps.nix` file, see [Generating and updating * `useDotnetFromEnv` will change the binary wrapper so that it uses the .NET from the environment. The runtime specified by `dotnet-runtime` is given as a fallback in case no .NET is installed in the user's environment. This is most useful for .NET global tools and LSP servers, which often extend the .NET CLI and their runtime should match the users' .NET runtime. * `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build. * `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore. -* `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute. * `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. Note that if set, only tests from this project are executed. * `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks. * `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`. diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 4548616c7d80..e2ddee48cc00 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -84,8 +84,6 @@ , dotnet-sdk ? dotnetCorePackages.sdk_6_0 # The dotnet runtime to use. , dotnet-runtime ? dotnetCorePackages.runtime_6_0 - # The dotnet SDK to run tests against. This can differentiate from the SDK compiled against. -, dotnet-test-sdk ? dotnet-sdk , ... } @ args: @@ -96,7 +94,7 @@ let else dotnet-sdk.meta.platforms; inherit (callPackage ./hooks { - inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; + inherit dotnet-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; runtimeId = if runtimeId != null then runtimeId diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 7012ff36a4a5..81becef9b30b 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -8,7 +8,6 @@ , makeSetupHook , makeWrapper , dotnet-sdk -, dotnet-test-sdk , disabledTests , nuget-source , dotnet-runtime @@ -25,7 +24,6 @@ in dotnetConfigureHook = callPackage ({ }: makeSetupHook { name = "dotnet-configure-hook"; - propagatedBuildInputs = [ dotnet-sdk nuget-source ]; substitutions = { nugetSource = nuget-source; dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; @@ -43,7 +41,6 @@ in dotnetBuildHook = callPackage ({ }: makeSetupHook { name = "dotnet-build-hook"; - propagatedBuildInputs = [ dotnet-sdk ]; substitutions = { inherit buildType runtimeId; }; @@ -52,7 +49,6 @@ in dotnetCheckHook = callPackage ({ }: makeSetupHook { name = "dotnet-check-hook"; - propagatedBuildInputs = [ dotnet-test-sdk ]; substitutions = { inherit buildType runtimeId libraryPath; disabledTests = lib.optionalString (disabledTests != []) @@ -67,7 +63,6 @@ in dotnetInstallHook = callPackage ({ }: makeSetupHook { name = "dotnet-install-hook"; - propagatedBuildInputs = [ dotnet-sdk ]; substitutions = { inherit buildType runtimeId; }; @@ -76,7 +71,6 @@ in dotnetFixupHook = callPackage ({ }: makeSetupHook { name = "dotnet-fixup-hook"; - propagatedBuildInputs = [ dotnet-runtime ]; substitutions = { dotnetRuntime = dotnet-runtime; runtimeDeps = libraryPath; From cfd1bd614134e3705c380c217f6c34bb6621d051 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 22 May 2024 03:12:30 +0300 Subject: [PATCH 094/311] buildDotnetModule: remove unnecessary callPackage calls This change removes no-op callPackage calls and reformats the file with nixpkgs-fmt. --- .../build-dotnet-module/hooks/default.nix | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 81becef9b30b..44091604f5c2 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -21,8 +21,8 @@ let libraryPath = lib.makeLibraryPath runtimeDeps; in { - dotnetConfigureHook = callPackage ({ }: - makeSetupHook { + dotnetConfigureHook = makeSetupHook + { name = "dotnet-configure-hook"; substitutions = { nugetSource = nuget-source; @@ -36,40 +36,46 @@ in ]; inherit runtimeId; }; - } ./dotnet-configure-hook.sh) { }; + } + ./dotnet-configure-hook.sh; - dotnetBuildHook = callPackage ({ }: - makeSetupHook { + dotnetBuildHook = makeSetupHook + { name = "dotnet-build-hook"; substitutions = { inherit buildType runtimeId; }; - } ./dotnet-build-hook.sh) { }; + } + ./dotnet-build-hook.sh; - dotnetCheckHook = callPackage ({ }: - makeSetupHook { + dotnetCheckHook = makeSetupHook + { name = "dotnet-check-hook"; substitutions = { inherit buildType runtimeId libraryPath; - disabledTests = lib.optionalString (disabledTests != []) - (let - escapedNames = lib.lists.map (n: lib.replaceStrings [","] ["%2C"] n) disabledTests; - filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames; - in - "${lib.concatStringsSep "&" filters}"); + disabledTests = lib.optionalString (disabledTests != [ ]) + ( + let + escapedNames = lib.lists.map (n: lib.replaceStrings [ "," ] [ "%2C" ] n) disabledTests; + filters = lib.lists.map (n: "FullyQualifiedName!=${n}") escapedNames; + in + "${lib.concatStringsSep "&" filters}" + ); }; - } ./dotnet-check-hook.sh) { }; + } + ./dotnet-check-hook.sh; - dotnetInstallHook = callPackage ({ }: - makeSetupHook { + dotnetInstallHook = makeSetupHook + { name = "dotnet-install-hook"; substitutions = { inherit buildType runtimeId; }; - } ./dotnet-install-hook.sh) { }; + } + ./dotnet-install-hook.sh; - dotnetFixupHook = callPackage ({ }: - makeSetupHook { + dotnetFixupHook = makeSetupHook + { name = "dotnet-fixup-hook"; substitutions = { dotnetRuntime = dotnet-runtime; @@ -79,5 +85,6 @@ in dirname = "${coreutils}/bin/dirname"; realpath = "${coreutils}/bin/realpath"; }; - } ./dotnet-fixup-hook.sh) { }; + } + ./dotnet-fixup-hook.sh; } From 7d7251c9b07cfb1e3e3af2eba09c2f6d83245605 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 00:37:34 +0000 Subject: [PATCH 095/311] argocd: 2.11.0 -> 2.11.1 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 64cd0aaa2413..fc26ce3d5ba8 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-HVkR5sG3CfTW56pTB15S+w4kwbv7he9Be6RKmpu+E4E="; + hash = "sha256-v3Y85e0I5CCL4+cT4O/VhKRIHKiw088XbqjuwZr0CeM="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-c0fTUU5zXI0QDo/bAL4v6zjEp0rNvCpQFAGwpgDWDFY="; + vendorHash = "sha256-+YRLIQWInGCV2ORuABvM4cCjiMznENmAmE2jF9Eql6w="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From dd0ebdffcd90a9a1d33297f401a776c3b510509e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 21 May 2024 20:52:42 -0400 Subject: [PATCH 096/311] nixos/systemd-stage-1/dbus: Fix systemd services --- nixos/modules/services/system/dbus.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 26f4eba707f9..d84136125f93 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -128,10 +128,14 @@ in contents."/etc/dbus-1".source = pkgs.makeDBusConf { inherit (cfg) apparmor; suidHelper = "/bin/false"; - serviceDirectories = [ pkgs.dbus ]; + serviceDirectories = [ pkgs.dbus config.boot.initrd.systemd.package ]; }; packages = [ pkgs.dbus ]; - storePaths = [ "${pkgs.dbus}/bin/dbus-daemon" ]; + storePaths = [ + "${pkgs.dbus}/bin/dbus-daemon" + "${config.boot.initrd.systemd.package}/share/dbus-1/system-services" + "${config.boot.initrd.systemd.package}/share/dbus-1/system.d" + ]; targets.sockets.wants = [ "dbus.socket" ]; }; }) From 072054ccb5d8c73ee0cc75d37b3e5d16c33d2de4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 7 Apr 2024 21:18:59 -0400 Subject: [PATCH 097/311] nixos/systemd-stage-1: Support systemd-resolved --- nixos/modules/system/boot/resolved.nix | 64 ++++++++++++++++++++------ 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 2c9a7ddee4f6..b658a7a2dc05 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -7,6 +7,20 @@ let dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; + resolvedConf = '' + [Resolve] + ${optionalString (config.networking.nameservers != []) + "DNS=${concatStringsSep " " config.networking.nameservers}"} + ${optionalString (cfg.fallbackDns != null) + "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} + ${optionalString (cfg.domains != []) + "Domains=${concatStringsSep " " cfg.domains}"} + LLMNR=${cfg.llmnr} + DNSSEC=${cfg.dnssec} + DNSOverTLS=${cfg.dnsovertls} + ${config.services.resolved.extraConfig} + ''; + in { @@ -126,6 +140,15 @@ in ''; }; + boot.initrd.services.resolved.enable = mkOption { + default = config.boot.initrd.systemd.network.enable; + defaultText = "config.boot.initrd.systemd.network.enable"; + description = '' + Whether to enable resolved for stage 1 networking. + Uses the toplevel 'services.resolved' options for 'resolved.conf' + ''; + }; + }; config = mkMerge [ @@ -155,19 +178,7 @@ in }; environment.etc = { - "systemd/resolved.conf".text = '' - [Resolve] - ${optionalString (config.networking.nameservers != []) - "DNS=${concatStringsSep " " config.networking.nameservers}"} - ${optionalString (cfg.fallbackDns != null) - "FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"} - ${optionalString (cfg.domains != []) - "Domains=${concatStringsSep " " cfg.domains}"} - LLMNR=${cfg.llmnr} - DNSSEC=${cfg.dnssec} - DNSOverTLS=${cfg.dnsovertls} - ${config.services.resolved.extraConfig} - ''; + "systemd/resolved.conf".text = resolvedConf; # symlink the dynamic stub resolver of resolv.conf as recommended by upstream: # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf @@ -183,6 +194,33 @@ in }) + (mkIf config.boot.initrd.services.resolved.enable { + + assertions = [ + { + assertion = config.boot.initrd.systemd.enable; + message = "'boot.initrd.services.resolved.enable' can only be enabled with systemd stage 1."; + } + ]; + + boot.initrd.systemd = { + contents = { + "/etc/tmpfiles.d/resolv.conf".text = + "L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf"; + "/etc/systemd/resolved.conf".text = resolvedConf; + }; + + additionalUpstreamUnits = ["systemd-resolved.service"]; + users.systemd-resolve = {}; + groups.systemd-resolve = {}; + storePaths = ["${config.boot.initrd.systemd.package}/lib/systemd/systemd-resolved"]; + services.systemd-resolved = { + wantedBy = ["sysinit.target"]; + aliases = [ "dbus-org.freedesktop.resolve1.service" ]; + }; + }; + + }) ]; } From bfdba4d0812c080fc5d4667377e5d4afee88ba88 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 21 May 2024 02:39:10 -0400 Subject: [PATCH 098/311] nixos/tests: systemd-resolved in stage 1 --- nixos/tests/systemd-resolved.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nixos/tests/systemd-resolved.nix b/nixos/tests/systemd-resolved.nix index 64630b3e9909..3eedc17f4b34 100644 --- a/nixos/tests/systemd-resolved.nix +++ b/nixos/tests/systemd-resolved.nix @@ -41,6 +41,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { networking.useNetworkd = true; networking.useDHCP = false; systemd.network.networks."40-eth0".enable = false; + + testing.initrdBackdoor = true; + boot.initrd = { + systemd.enable = true; + systemd.initrdBin = [ pkgs.iputils ]; + network.enable = true; + services.resolved.enable = true; + }; }; testScript = { nodes, ... }: let @@ -49,12 +57,19 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { in '' start_all() server.wait_for_unit("multi-user.target") - client.wait_for_unit("multi-user.target") - query = client.succeed("resolvectl query example.com") - assert "${address4}" in query - assert "${address6}" in query - client.succeed("ping -4 -c 1 example.com") - client.succeed("ping -6 -c 1 example.com") + def test_client(): + query = client.succeed("resolvectl query example.com") + assert "${address4}" in query + assert "${address6}" in query + client.succeed("ping -4 -c 1 example.com") + client.succeed("ping -6 -c 1 example.com") + + client.wait_for_unit("initrd.target") + test_client() + client.switch_root() + + client.wait_for_unit("multi-user.target") + test_client() ''; }) From f1337d6054743c4169c5adb506d7e8672f91eed0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 01:19:46 +0000 Subject: [PATCH 099/311] gfxreconstruct: 1.0.3 -> 1.0.4 --- pkgs/tools/graphics/gfxreconstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix index 6dbc039b5df2..5e5cbfbabc59 100644 --- a/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-4qNAMPswsYtzHmTKr+waDLoWa9xex5hvX1Og/KibiBg="; + hash = "sha256-MuCdJoBFxKwDCOCltlU3oBS9elFS6F251dHjHcIb4Jg="; fetchSubmodules = true; }; From f3113177fc8a2abc3f174e7ec6b662fcc7dd1d19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 02:09:33 +0000 Subject: [PATCH 100/311] kyverno-chainsaw: 0.2.1 -> 0.2.2 --- pkgs/by-name/ky/kyverno-chainsaw/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index d20c7308b423..082781d02695 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-eQA4KiQH1tIbolQBKPId8hKCO0mcUnEyJ77+WSGYDjQ="; + hash = "sha256-jTrASkIcvHQN8TcxyfAeYVN50L2cgZXrKJRI8BN9Muk="; }; vendorHash = "sha256-3x1HAt08Tbs56vaT2tBS//FPRn4JdFOI00XmlXMbs3w="; From 9a259176271839dcbb2935be0842e425ef9162f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 02:09:39 +0000 Subject: [PATCH 101/311] lint-staged: 15.2.2 -> 15.2.4 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 8366ff1e6372..9c3eddd9ddae 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.2"; + version = "15.2.4"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-gdL/gOAHcgvKUot6MmC1rUMmcrLgLMf1ISc1oPNWJOQ="; + hash = "sha256-TGJz1jWXTNlTfHe1ed4jjR6SBlXriIAQJXQ4W6b7dQU="; }; - npmDepsHash = "sha256-32E5y0s6Hm8i74zso/yOmCYWZ6y2Sx4rn8ylSb0c8qE="; + npmDepsHash = "sha256-2Lv7k41hWVHF5PGdpYlMoFAj/zDPuRg6ydXaWTpUR/g="; dontNpmBuild = true; From 631b05a79a50fa88ef2751cb8b70699058b513c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 02:34:01 +0000 Subject: [PATCH 102/311] nats-server: 2.10.14 -> 2.10.16 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 440d0e1d81af..00a3b156528e 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.14"; + version = "2.10.16"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-+DdhdW8CCMprjR2XcOntkTDh5CHtEFHYFz7Htdptw3s="; + hash = "sha256-OyDDAx1jmemFn9D4VJPWrLJJM1YB8tZBC7N3xrUYodA="; }; - vendorHash = "sha256-4kBXVsKf1jD3zvaAy6Rb7zmIK1WPbi31GRvRghdEC/s="; + vendorHash = "sha256-g1BF0Xl3AwHKSJ3k/gfJN5L875SdoDGK0Lk2gUUq4y4="; doCheck = false; From aa65269218f5c2ab60cb6b50873bd0fbce3627a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 02:41:53 +0000 Subject: [PATCH 103/311] qlog: 0.35.1 -> 0.35.2 --- pkgs/applications/radio/qlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index e89b1014e528..2f14292e6670 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-qmTep8cwNFxgvWO6tOtk+kwjhEltjJTc0Fo4o01GzIo="; + hash = "sha256-3ht3/J4uJ7Nyfp0xpVDYa8GnV/EvHjf09XGSEBLRGZU="; fetchSubmodules = true; }; From bd1dafa8d6b7dd2ab3adb95bc5eb03b555aa8630 Mon Sep 17 00:00:00 2001 From: Assistant Date: Tue, 21 May 2024 23:04:12 -0400 Subject: [PATCH 104/311] twitch-chat-downloader: add assistant to maintainers --- pkgs/applications/misc/twitch-chat-downloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 459a47bfcab0..c649aa3811c5 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -34,6 +34,6 @@ buildPythonApplication rec { mainProgram = "tcd"; homepage = "https://github.com/TheDrHax/Twitch-Chat-Downloader"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ assistant ]; }; } From 6d35a341f85f743b1eff5722b600edcfcc779204 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 8 May 2024 00:18:12 +0800 Subject: [PATCH 105/311] cbmc: 5.91.0 -> 5.95.1 --- .../0001-Do-not-download-sources-in-cmake.patch | 14 +++++++------- pkgs/applications/science/logic/cbmc/default.nix | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch index 181214093ef8..c209ed059e44 100644 --- a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch +++ b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch @@ -1,4 +1,4 @@ -From 206084d2e08198b0b5b67733c407bd3fb74affb1 Mon Sep 17 00:00:00 2001 +From 714f5ebe9ade721abdccf58edfcddba52465cb8d Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 2 Jul 2023 22:43:27 +0800 Subject: [PATCH] Do not download sources in cmake @@ -8,7 +8,7 @@ Subject: [PATCH] Do not download sources in cmake 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt -index 8bfcf4d13c..6ba858a461 100644 +index daa0853a57..4bcbbdaa47 100644 --- a/src/solvers/CMakeLists.txt +++ b/src/solvers/CMakeLists.txt @@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl}) @@ -16,11 +16,11 @@ index 8bfcf4d13c..6ba858a461 100644 message(STATUS "Building solvers with cadical") - download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz -- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch +- URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz +- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch - COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt - COMMAND ./configure -- URL_MD5 265b1a715000ed3c5b6de36ddd1278a0 +- URL_MD5 be646831a017f81b300664e58deba1b5 - ) - - add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR}) @@ -32,10 +32,10 @@ index 8bfcf4d13c..6ba858a461 100644 target_include_directories(solvers PUBLIC ${cadical_SOURCE_DIR}/src -+ ${cadical_INCLUDE_DIR} ++ ${cadical_INCLUDE_DIR} ) target_link_libraries(solvers cadical) -- -2.40.1 +2.42.0 diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 6a878735bb3d..dcf5b5bb37fa 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.91.0"; + version = "5.95.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-7DzhGEDS9T6WIjGoxOw9Gf/q+tYNFJDPbQUBV3tbn/I="; + sha256 = "sha256-fDLSo5EeHyPTliAqFp+5mfaB0iZXIMXeMyF21fjl5k4="; }; nativeBuildInputs = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; - # https://github.com/diffblue/cbmc/issues/7423 - broken = stdenv.isLinux && stdenv.isAarch64; + # error: no member named 'aligned_alloc' in the global namespace + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From fa8b81ca08259201e70c051c9532e60f4971a973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 03:52:18 +0000 Subject: [PATCH 106/311] nixpacks: 1.22.0 -> 1.23.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 6d6fd23717e5..9da8b1fc1747 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O2A75cjTU72DGrg4PmEogN9aANYKIZWUkXfIJXs7CwA="; + sha256 = "sha256-M4RZwcFiupZdePDkUWRTiTNA58siMsggTGpvHb8j88Y="; }; - cargoHash = "sha256-FS38zqPtmtyV6oSjfxtNMe8n+LMTU1eBN6oX6CGph6k="; + cargoHash = "sha256-hSzDboP2YJoPPzugb0ABiogKU7lauJNML8szThB2zqg="; # skip test due FHS dependency doCheck = false; From f36541d2bdb7faca1284edf4d1e8f853ee35f6c0 Mon Sep 17 00:00:00 2001 From: daru Date: Wed, 22 May 2024 06:22:40 +0200 Subject: [PATCH 107/311] ianny: 1.0.0beta.1 -> 1.0.0 --- pkgs/by-name/ia/ianny/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix index 6b7c3ca940e5..0dfb0e3dfdf7 100644 --- a/pkgs/by-name/ia/ianny/package.nix +++ b/pkgs/by-name/ia/ianny/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ianny"; - version = "1.0.0beta.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "zefr0x"; repo = "ianny"; rev = "v${version}"; - hash = "sha256-Bnr+wtusvTM690IISBs0wKj0ChBoIrMHyVZ8wdGgK08="; + hash = "sha256-1QkGs4qCzEA4K3H39QcRV+yINIeZRkjBBkASO69F7ik="; }; - cargoHash = "sha256-/8C+hDq/z+h1uxO9prLbKHgyfMGrMODAs5/yUrutaAM="; + cargoHash = "sha256-gKCmiqHkCB7nP5XIaFi/8Wi/x5WFEHEmHczKiIDDxXE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus.dev ]; From 7d5d4ed7f02ecf257ca6f9a9fed6e72940f2a46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 22 May 2024 08:09:56 +0300 Subject: [PATCH 108/311] inotify-info: v0.0.1 -> v0.0.2 --- pkgs/by-name/in/inotify-info/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix index ea7235917caf..0405400b7f6d 100644 --- a/pkgs/by-name/in/inotify-info/package.nix +++ b/pkgs/by-name/in/inotify-info/package.nix @@ -5,15 +5,17 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-fsUvIXWnP6Iy9Db0wDG+ntSw6mUt0MQOTJA5vFxhH+U="; + hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY="; }; + buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"]; + installPhase = '' runHook preInstall install -Dm755 _release/inotify-info $out/bin/inotify-info From d87803b7428dd56ef7f120c2ee853728ef812eaa Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 21 May 2024 10:38:47 +0200 Subject: [PATCH 109/311] check-by-name: remove concurrency group Due to the trigger on PR edit, every change to the PR body will trigger a re-run of the check-by-name workflow. This is needed to catch of the base branch. However, an action like ticking the checkbox of a PR will also trigger a re-run. Furthermore, due to the concurrency group, any already running check-by-name workflow will be canceled, leading to a notification sent to the PR author. To reduce the noise, remove the concurrency group. As a consequence, multiple runs will run to completion on the same PR/commit. While concurrent runs are often canceled after a few seconds, the workflow will take about a minute to complete. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .github/workflows/check-by-name.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index e857c88f746d..ce7802f4aa8e 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -14,16 +14,16 @@ on: # While `edited` is also triggered when the PR title/body is changed, # this PR action is fairly quick, and PR's don't get edited that often, # so it shouldn't be a problem + # There is a feature request for adding a `base_changed` event: + # https://github.com/orgs/community/discussions/35058 types: [opened, synchronize, reopened, edited] permissions: {} -# Create a check-by-name concurrency group based on the pull request number. if -# an event triggers a run on the same PR while a previous run is still in -# progress, the previous run will be canceled and the new one will start. -concurrency: - group: check-by-name-${{ github.event.pull_request.number }} - cancel-in-progress: true +# We don't use a concurrency group here, because the action is triggered quite often (due to the PR edit +# trigger), and contributers would get notified on any canceled run. +# There is a feature request for supressing notifications on concurrency-canceled runs: +# https://github.com/orgs/community/discussions/13015 jobs: check: From 4320e274800ba5de3fb4e488fb4b3f2a8b4381bf Mon Sep 17 00:00:00 2001 From: backfire-monism-net Date: Wed, 22 May 2024 02:02:11 -0700 Subject: [PATCH 110/311] majima: 0.4.0 -> 0.5.0 --- pkgs/by-name/ma/majima/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ma/majima/package.nix b/pkgs/by-name/ma/majima/package.nix index d2ff843cd66a..810936ecf5a0 100644 --- a/pkgs/by-name/ma/majima/package.nix +++ b/pkgs/by-name/ma/majima/package.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitLab, rustPlatform }: -rustPlatform.buildRustPackage rec { +{ lib, fetchFromSourcehut, rustPlatform }: +rustPlatform.buildRustPackage { pname = "majima"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchFromGitLab { - owner = "gumball-overall"; + src = fetchFromSourcehut { + owner = "~cucumber-zoom"; repo = "majima"; - rev = version; - hash = "sha256-S62DQfvZFg8C26YG+fIVJj5cJ6mz73JXSgdu5yoK0Yo="; + rev = "0f32dceeaf09c082cf33ab31b40d3bfc45aaa6f8"; + hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ="; }; - cargoHash = "sha256-zMQO6McnnGbp52A9n/h6yZTU9VH7vak2TSP0HLqDlKw="; + cargoHash = "sha256-sblSlmXkiJkVGbrMU6HgtvYnAd48SlUOgDwB6ASMFsQ="; meta = { description = "Generate random usernames quickly and in various formats"; From 167be2d7714c45860e947db28a40b8923ef749fc Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 16:11:45 +0400 Subject: [PATCH 111/311] python3Packages.morecantile: init at 5.3.0 --- .../python-modules/morecantile/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/morecantile/default.nix diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix new file mode 100644 index 000000000000..00a6a7c533b4 --- /dev/null +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + attrs, + click, + flit, + mercantile, + pydantic, + pyproj, + rasterio, +}: + +buildPythonPackage rec { + pname = "morecantile"; + version = "5.3.0"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "developmentseed"; + repo = "morecantile"; + rev = version; + hash = "sha256-F7xYQrOngoRsZjmS6ZHRGN0/GD53AYcMQzyY1LZ1O7I="; + }; + + nativeBuildInputs = [ flit ]; + + propagatedBuildInputs = [ + attrs + click + pydantic + pyproj + ]; + + nativeCheckInputs = [ + mercantile + pytestCheckHook + rasterio + ]; + + pythonImportsCheck = [ "morecantile" ]; + + meta = { + description = "Construct and use map tile grids in different projection"; + homepage = "https://developmentseed.org/morecantile/"; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + mainProgram = "morecantile"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73bf650c68c3..f18b0beb21da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7671,6 +7671,8 @@ self: super: with self; { more-properties = callPackage ../development/python-modules/more-properties { }; + morecantile = callPackage ../development/python-modules/morecantile { }; + moreorless = callPackage ../development/python-modules/moreorless { }; moretools = callPackage ../development/python-modules/moretools { }; From 55f6adc1b1623a21ac55b65d0e42dbea45562419 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 16:19:18 +0400 Subject: [PATCH 112/311] python3Packages.rioxarray: init at 0.15.5 --- .../python-modules/rioxarray/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/rioxarray/default.nix diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix new file mode 100644 index 000000000000..5394906148c2 --- /dev/null +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + dask, + netcdf4, + numpy, + packaging, + pyproj, + rasterio, + setuptools, + xarray, +}: + +buildPythonPackage rec { + pname = "rioxarray"; + version = "0.15.5"; + pyproject = true; + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "corteva"; + repo = "rioxarray"; + rev = version; + hash = "sha256-bumFZQktgUqo2lyoLtDXkh6Vv5oS/wobqYpvNYy7La0="; + }; + + build-system = [ setuptools ]; + + propagatedBuildInputs = [ + numpy + packaging + pyproj + rasterio + xarray + ]; + + nativeCheckInputs = [ + dask + netcdf4 + pytestCheckHook + ]; + + disabledTests = [ "test_clip_geojson__no_drop" ]; + + pythonImportsCheck = [ "rioxarray" ]; + + meta = { + description = "geospatial xarray extension powered by rasterio"; + homepage = "https://corteva.github.io/rioxarray/"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f18b0beb21da..2017434f100c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13285,6 +13285,8 @@ self: super: with self; { ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + rioxarray = callPackage ../development/python-modules/rioxarray { }; + ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { }; ripe-atlas-sagan = callPackage ../development/python-modules/ripe-atlas-sagan { }; From 6f0396177b65f4ac09c39d4186b241cffaad6d21 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 21:09:40 +0400 Subject: [PATCH 113/311] python3Packages.color-operations: init at 0.1.3 --- .../color-operations/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/color-operations/default.nix diff --git a/pkgs/development/python-modules/color-operations/default.nix b/pkgs/development/python-modules/color-operations/default.nix new file mode 100644 index 000000000000..e4189e06809a --- /dev/null +++ b/pkgs/development/python-modules/color-operations/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + colormath, + cython, + oldest-supported-numpy, + setuptools, +}: + +buildPythonPackage rec { + pname = "color-operations"; + version = "0.1.3"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vincentsarago"; + repo = "color-operations"; + rev = version; + hash = "sha256-KsrgilcNK2ufPKrhtGdf8mdlFzhsHB2jHN+WDlZqabc="; + }; + + nativeBuildInputs = [ + cython + setuptools + ]; + + propagatedBuildInputs = [ oldest-supported-numpy ]; + + nativeCheckInputs = [ + colormath + pytestCheckHook + ]; + + preCheck = '' + python setup.py build_ext --inplace + ''; + + pythonImportsCheck = [ "color_operations" ]; + + meta = { + description = "Apply basic color-oriented image operations. Fork of rio-color"; + homepage = "https://github.com/vincentsarago/color-operations"; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2017434f100c..8bb100c51185 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2358,6 +2358,8 @@ self: super: with self; { collidoscope = callPackage ../development/python-modules/collidoscope { }; + color-operations = callPackage ../development/python-modules/color-operations { }; + colorama = callPackage ../development/python-modules/colorama { }; colorcet = callPackage ../development/python-modules/colorcet { }; From 05233494a5d6bb42567b143da0e50ec7e28795e7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 21:37:59 +0400 Subject: [PATCH 114/311] python3Packages.pystac: init at 1.10.1 --- .../python-modules/pystac/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/pystac/default.nix diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix new file mode 100644 index 000000000000..eb7f653db9de --- /dev/null +++ b/pkgs/development/python-modules/pystac/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + html5lib, + jsonschema, + pytest-cov, + pytest-mock, + pytest-recording, + python-dateutil, + requests-mock, + setuptools, +}: + +buildPythonPackage rec { + pname = "pystac"; + version = "1.10.1"; + pyproject = true; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "stac-utils"; + repo = "pystac"; + rev = "v${version}"; + hash = "sha256-zJGDhKRX50Muo1YDEzfwypMLISnYBYKkPvUULYkUf68="; + }; + + build-system = [ setuptools ]; + + propagatedBuildInputs = [ python-dateutil ]; + + nativeCheckInputs = [ + html5lib + jsonschema + pytestCheckHook + pytest-cov + pytest-mock + pytest-recording + requests-mock + ]; + + pythonImportsCheck = [ "pystac" ]; + + meta = { + description = "Python library for working with any SpatioTemporal Asset Catalog (STAC)"; + homepage = "https://github.com/stac-utils/pystac"; + license = lib.licenses.asl20; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bb100c51185..021ce4df98ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10052,6 +10052,8 @@ self: super: with self; { pysolcast = callPackage ../development/python-modules/pysolcast { }; + pystac = callPackage ../development/python-modules/pystac { }; + pysubs2 = callPackage ../development/python-modules/pysubs2 { }; pysuez = callPackage ../development/python-modules/pysuez { }; From 0262b1e06e4494a1ea9f65407b7ab92f95f3c9e6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 18 May 2024 21:49:21 +0400 Subject: [PATCH 115/311] python3Packages.rio-tiler: init at 6.6.1 --- .../python-modules/rio-tiler/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/rio-tiler/default.nix diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix new file mode 100644 index 000000000000..757dd7c5e174 --- /dev/null +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -0,0 +1,65 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + + attrs, + boto3, + cachetools, + color-operations, + hatchling, + httpx, + morecantile, + numexpr, + numpy, + pydantic, + pystac, + rasterio, + rioxarray, +}: + +buildPythonPackage rec { + pname = "rio-tiler"; + version = "6.6.1"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "cogeotiff"; + repo = "rio-tiler"; + rev = version; + hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ="; + }; + + build-system = [ hatchling ]; + + propagatedBuildInputs = [ + attrs + cachetools + color-operations + httpx + morecantile + numexpr + numpy + pydantic + pystac + rasterio + ]; + + nativeCheckInputs = [ + boto3 + pytestCheckHook + rioxarray + ]; + + pythonImportsCheck = [ "rio_tiler" ]; + + meta = with lib; { + description = "User friendly Rasterio plugin to read raster datasets"; + homepage = "https://cogeotiff.github.io/rio-tiler/"; + license = licenses.bsd3; + maintainers = lib.teams.geospatial.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 021ce4df98ea..cbf7b07fc99e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13289,6 +13289,8 @@ self: super: with self; { ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + rio-tiler = callPackage ../development/python-modules/rio-tiler { }; + rioxarray = callPackage ../development/python-modules/rioxarray { }; ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { }; From bc7d0ea6060100b3f9eb95dc6d7efb5b9862d746 Mon Sep 17 00:00:00 2001 From: NixOS Date: Wed, 22 May 2024 11:47:39 +0200 Subject: [PATCH 116/311] tart: 2.10.0 -> 2.11.0 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 921a8b7e3dbc..7615c3da26b4 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-9spBDqNm47nUZEGCCOfISjNpGx/22OtPPheB7iJTq1A="; + hash = "sha256-Wf6JfEOUkCpUB0qsAGqh5v/sTV+iQ2NUmXKLyLgxgV0="; }; sourceRoot = "."; From a773a85c193e5277c20ef637c0e95314f679a37c Mon Sep 17 00:00:00 2001 From: David Wolff Date: Wed, 22 May 2024 12:00:39 +0200 Subject: [PATCH 117/311] stylance-cli: 0.3.0 -> 0.5.0 --- pkgs/by-name/st/stylance-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index 767d7370b766..5b6e426943a3 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "stylance-cli"; - version = "0.3.0"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-YQYYZxLypD5Nz8kllIaBFDoV8L2c9wzJwmszqPpjpmg="; + hash = "sha256-nwvlce1a5Qerh1wa/lAtkl60fpjMV6WQuEzNLfmCK7k="; }; - cargoHash = "sha256-ZzdLbsHRBgprdzmPVzywJx+wMMqRBsLeT84UIDMJbQM="; + cargoHash = "sha256-e8lu839kthncvCVlg13ZWNUwYGgGVgXZWJlHufubNA8="; meta = with lib; { description = "A library and cli tool for working with scoped CSS in rust"; From 7bda925dacb26d2207c5e3c4b23f7e12d6f4e497 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 19:59:09 +0100 Subject: [PATCH 118/311] maintainers: add greaka --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 67e7bc89adda..2c0604630eed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7725,6 +7725,14 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greaka = { + email = "git@greaka.de"; + github = "greaka"; + githubId = 2805834; + name = "Greaka"; + keys = + [{ fingerprint = "6275 FB5C C9AC 9D85 FF9E 44C5 EE92 A5CD C367 118C"; }]; + }; greg = { email = "greg.hellings@gmail.com"; github = "greg-hellings"; From 8d6f8c9ed75a8900b6bd91b2a54c305c38b4cf40 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:00:05 +0100 Subject: [PATCH 119/311] maintainers: add lpostula --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c0604630eed..b96386e5a549 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11916,6 +11916,14 @@ githubId = 10626; name = "Andreas Wagner"; }; + lpostula = { + email = "lois@postu.la"; + github = "loispostula"; + githubId = 1423612; + name = "Loïs Postula"; + keys = + [{ fingerprint = "0B4A E7C7 D3B7 53F5 3B3D 774C 3819 3C6A 09C3 9ED1"; }]; + }; lrewega = { email = "lrewega@c32.ca"; github = "lrewega"; From 0e5f44658ee645b05322c221f0e00b840991a8d2 Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:02:40 +0100 Subject: [PATCH 120/311] maintainers/team-list: add fslabs --- maintainers/team-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e0c1629a6f23..b2539cf31c82 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -345,6 +345,16 @@ with lib.maintainers; { shortName = "freedesktop.org packaging"; }; + fslabs = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + greaka + lpostula + ]; + scope = "Group registration for packages maintained by Foresight Spatial Labs."; + shortName = "Foresight Spatial Labs employees"; + }; + gcc = { members = [ synthetica From 5cfeab887c3e3e725d8eedb686bdaea7e28a064e Mon Sep 17 00:00:00 2001 From: Laurent Arnoud Date: Tue, 14 May 2024 22:21:53 +0200 Subject: [PATCH 121/311] dreamchess: init at 0.3.0 --- pkgs/by-name/dr/dreamchess/package.nix | 71 ++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/dr/dreamchess/package.nix diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix new file mode 100644 index 000000000000..f8829ac9587e --- /dev/null +++ b/pkgs/by-name/dr/dreamchess/package.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, bison +, flex +, gettext +, SDL2 +, SDL2_image +, SDL2_mixer +, expat +, glew +, freetype +, libSM +, libXext +, libGL +, libGLU +, xorg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dreamchess"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "dreamchess"; + repo = "dreamchess"; + rev = "${finalAttrs.version}"; + hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE="; + }; + + buildInputs = [ + SDL2 + SDL2_image + SDL2_mixer + expat + glew + freetype + libSM + libXext + libGL + libGLU + xorg.libxcb + xorg.libX11 + ]; + nativeBuildInputs = [ + cmake + bison + flex + gettext + ]; + cmakeFlags = [ + (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) + (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") + (lib.cmakeFeature "CMAKE_INSTALL_DATAROOTDIR" "${placeholder "out"}/share") + ]; + + doInstallCheck = true; + + postInstallCheck = '' + stat "''${!outputBin}/bin/${finalAttrs.meta.mainProgram}" + ''; + + meta = { + homepage = "https://github.com/dreamchess/dreamchess"; + description = "An OpenGL Chess Game"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ spk ]; + platforms = lib.platforms.linux; + mainProgram = "dreamchess"; + }; +}) From 09c7cd1ba66dcea35344e752100eb00d3211141c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 22 May 2024 14:34:43 +0200 Subject: [PATCH 122/311] python311Packages.gssapi: disable tests on darwin --- pkgs/development/python-modules/gssapi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 90d8b4810d43..76a5a1f0bafd 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -58,6 +58,9 @@ buildPythonPackage rec { GSS ]; + # k5test is marked as broken on darwin + doCheck = !stdenv.isDarwin; + nativeCheckInputs = [ k5test parameterized From 4f5bd47b5650f6ce4238952e71c7f1d130736aa4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 May 2024 12:07:11 +0800 Subject: [PATCH 123/311] pantheon-tweaks: 1.1.2 -> 2.0.1 Also move to by-name. https://github.com/pantheon-tweaks/pantheon-tweaks/compare/1.1.2...2.0.1 --- .../pa/pantheon-tweaks/package.nix} | 20 +++++++++---------- pkgs/desktops/pantheon/default.nix | 6 ++---- .../pantheon-tweaks/fix-paths.patch | 13 ------------ pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 12 insertions(+), 29 deletions(-) rename pkgs/{desktops/pantheon/third-party/pantheon-tweaks/default.nix => by-name/pa/pantheon-tweaks/package.nix} (71%) delete mode 100644 pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix similarity index 71% rename from pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix rename to pkgs/by-name/pa/pantheon-tweaks/package.nix index c05c4b9b0a25..26630f6f72df 100644 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix @@ -7,6 +7,7 @@ , pkg-config , python3 , vala +, wrapGAppsHook3 , gtk3 , libgee , pantheon @@ -14,25 +15,22 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.1.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-E9YSRfh9bLAHn2y4p3aKwR5NOtexKokLWj3RwtDnLsQ="; + hash = "sha256-P3eM+xgsAMvqr2mIEjkQSjhxvQAwtSNItxAUcjO3ciY="; }; - patches = [ - ./fix-paths.patch - ]; - nativeBuildInputs = [ meson ninja pkg-config python3 vala + wrapGAppsHook3 ]; buildInputs = [ @@ -42,12 +40,14 @@ stdenv.mkDerivation rec { elementary-files # settings schemas elementary-terminal # settings schemas granite - switchboard ]); postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py + + substituteInPlace src/Settings/ThemeSettings.vala \ + --replace-fail "/usr/share/" "/run/current-system/sw/share/" ''; passthru = { @@ -55,15 +55,15 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Unofficial system settings panel for Pantheon"; + description = "Unofficial system customization app for Pantheon"; longDescription = '' - Unofficial system settings panel for Pantheon + Unofficial system customization app for Pantheon that lets you easily and safely customise your desktop's appearance. - Use programs.pantheon-tweaks.enable to add this to your switchboard. ''; homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; + mainProgram = "pantheon-tweaks"; }; } diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index d7bd9c926ede..58a4ba65f1ac 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -221,10 +221,8 @@ lib.makeScope pkgs.newScope (self: with self; { ### THIRD-PARTY - # Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party, - # specifically third party switchboard plugins and wingpanel indicators. - # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. - # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 + # As suggested in https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 + # please avoid putting third-party packages in the `pantheon` scope. }) // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch b/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch deleted file mode 100644 index b2e0e0a7b4c8..000000000000 --- a/pkgs/desktops/pantheon/third-party/pantheon-tweaks/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala -index 589121b..8e9c81e 100644 ---- a/src/Settings/ThemeSettings.vala -+++ b/src/Settings/ThemeSettings.vala -@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { - var themes = new Gee.ArrayList (); - - string[] dirs = { -- "/usr/share/" + path + "/", -+ "/run/current-system/sw/share/" + path + "/", - Environment.get_home_dir () + "/." + path + "/", - Environment.get_home_dir () + "/.local/share/" + path + "/"}; - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a145ec53318..c4a0a991b5dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37698,8 +37698,6 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; rox-filer = callPackage ../desktops/rox/rox-filer { From 735a11d300ec124bb80be203bf3383cccc6453e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 21 May 2024 22:35:22 +0800 Subject: [PATCH 124/311] nixos/pantheon-tweaks: remove You can just add the app to environment.systemPackages. --- .../doc/manual/release-notes/rl-2111.section.md | 2 +- nixos/modules/module-list.nix | 1 - nixos/modules/programs/pantheon-tweaks.nix | 17 ----------------- nixos/modules/rename.nix | 8 ++++++-- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 nixos/modules/programs/pantheon-tweaks.nix diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 8edf4fd35e4f..4143f440f289 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -146,7 +146,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable). -- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable). +- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as `programs.pantheon-tweaks`. - [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 44348b930c25..0ba54f066b2a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -249,7 +249,6 @@ ./programs/oblogout.nix ./programs/oddjobd.nix ./programs/openvpn3.nix - ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/pqos-wrapper.nix diff --git a/nixos/modules/programs/pantheon-tweaks.nix b/nixos/modules/programs/pantheon-tweaks.nix deleted file mode 100644 index b7258e2eb4bf..000000000000 --- a/nixos/modules/programs/pantheon-tweaks.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - meta = { - maintainers = lib.teams.pantheon.members; - }; - - ###### interface - options = { - programs.pantheon-tweaks.enable = lib.mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; - }; - - ###### implementation - config = lib.mkIf config.programs.pantheon-tweaks.enable { - services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 01985995a651..d4661a19188c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -40,12 +40,16 @@ in (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "pantheon-tweaks" ] '' + pantheon-tweaks is no longer a switchboard plugin but an independent app, + adding the package to environment.systemPackages is sufficient. + '') (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' - The hidepid module was removed, since the underlying machinery - is broken when using cgroups-v2. + The hidepid module was removed, since the underlying machinery + is broken when using cgroups-v2. '') (mkRemovedOptionModule [ "services" "baget" "enable" ] "The baget module was removed due to the upstream package being unmaintained.") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") From 05de507a98031a2acc1948edfe45f1f5259f9895 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 22 May 2024 16:48:34 +0800 Subject: [PATCH 125/311] turtle: init at 0.8 --- pkgs/by-name/tu/turtle/package.nix | 78 ++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 pkgs/by-name/tu/turtle/package.nix diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix new file mode 100644 index 000000000000..2d80802df53b --- /dev/null +++ b/pkgs/by-name/tu/turtle/package.nix @@ -0,0 +1,78 @@ +{ + lib, + python3Packages, + fetchFromGitLab, + gobject-introspection, + wrapGAppsHook4, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "turtle"; + version = "0.8"; + pyproject = true; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "philippun1"; + repo = "turtle"; + rev = version; + hash = "sha256-YacuT5S6WrhSz031XXCQTo++r+DBozrIIXrn9BwmrR0="; + }; + + postPatch = '' + substituteInPlace ./install.py \ + --replace-fail "/usr" "$out" \ + --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ libadwaita ]; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + pygobject3 + pygit2 + ]; + + postInstall = '' + python ./install.py install + ''; + + # Avoid wrapping two times + dontWrapGApps = true; + + # Make sure we patch other scripts after wrapper is generated + # to get $program_PYTHONPATH + dontWrapPythonPrograms = true; + + postFixup = + '' + makeWrapperArgs+=(''${gappsWrapperArgs[@]}) + wrapPythonPrograms + '' + # Dialogs are not imported, but executed. The same does + # nautilus-python plugins. So we need to patch them as well. + + '' + for dialog_scripts in $out/lib/python*/site-packages/turtlevcs/dialogs/*.py; do + patchPythonScript $dialog_scripts + done + for nautilus_extensions in $out/share/nautilus-python/extensions/*.py; do + patchPythonScript $nautilus_extensions + done + ''; + + meta = { + description = "A graphical interface for version control intended to run on gnome and nautilus"; + homepage = "https://gitlab.gnome.org/philippun1/turtle"; + license = lib.licenses.gpl3Plus; + mainProgram = "turtle_cli"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +} From 23fbbca6a275afdf3a935fc746b3641ede88707f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 14:41:07 +0000 Subject: [PATCH 126/311] dufs: 0.40.0 -> 0.41.0 --- pkgs/servers/http/dufs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 433a68d1a54a..18296529570b 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-BoFoF7V6bTQiJ+afGnivviU/s2ikOxAX06s+AwRxo8Q="; + hash = "sha256-Ab/f6n2n24mLsWS4WF6jOBt9m7dyeSP0ftYixKANsjY="; }; - cargoHash = "sha256-B0K/lco7suYM0/02LaDbeqyt4zyiwoeBxhmUPsVTvkw="; + cargoHash = "sha256-CNHDZHyg4jrEl3hmdQ7ITCtg9iTmB2RwDAzqSirOCO4="; nativeBuildInputs = [ installShellFiles ]; From aeb3bcf4de108438753450d0ceaf70c0eeb15f6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 14:43:26 +0000 Subject: [PATCH 127/311] himitsu: 0.6 -> 0.7 --- pkgs/tools/security/himitsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/tools/security/himitsu/default.nix index d6bbb8fd6921..3985a5c80a44 100644 --- a/pkgs/tools/security/himitsu/default.nix +++ b/pkgs/tools/security/himitsu/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "himitsu"; - version = "0.6"; + version = "0.7"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; rev = version; - hash = "sha256-3x6Lc1rWBtYWVocBuMV5CtoZQjL0Ce+6J2xFjaYaeG4="; + hash = "sha256-jDxQajc8Kyfihm8q3wCpA+WsbAkQEZerLckLQXNhTa8="; }; nativeBuildInputs = [ From 1b6e10388179be544465a91d2b26b25db042ae29 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Wed, 22 May 2024 17:58:32 +0200 Subject: [PATCH 128/311] ttags: 0.3.0 -> 0.4.1 --- pkgs/development/tools/misc/ttags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/development/tools/misc/ttags/default.nix index c765d0c308d4..b95bc53e2bea 100644 --- a/pkgs/development/tools/misc/ttags/default.nix +++ b/pkgs/development/tools/misc/ttags/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform, testers, ttags }: -let version = "0.3.0"; +let version = "0.4.1"; in rustPlatform.buildRustPackage { pname = "ttags"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "npezza93"; repo = "ttags"; rev = "${version}"; - hash = "sha256-yqrCcA/+FyGPpX3hhULiwhMfrDWjq+rzT04M+o9ry5s="; + hash = "sha256-yKg0KUA/Wa7B/sU1uxgGQR0Wat/bFv3ascqnUCdWKw0="; }; - cargoHash = "sha256-jW3xIlo2cN5aoEUp3FxN4pwGFvlg50i5RMNgQopGb88="; + cargoHash = "sha256-MZ9QRF5yNw+YtSEu+Qc/J3Ap7+nRDZT7aitunk+x38Y="; passthru.tests.version = testers.testVersion { package = ttags; From 27952b0347ec3858576e85b7d3294d33fcdfef22 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 23 May 2024 00:20:46 +0900 Subject: [PATCH 129/311] python311Packages.libvirt: refactor and remove nose --- .../development/python-modules/libvirt/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index e5ccec9371ee..f424240f91ea 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchFromGitLab, + setuptools, pkg-config, lxml, libvirt, - nose, + pytestCheckHook, }: buildPythonPackage rec { pname = "libvirt"; version = "10.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitLab { owner = "libvirt"; @@ -20,16 +21,17 @@ buildPythonPackage rec { hash = "sha256-zl1Hfm7flRflNjIpLoLAlPDysYlieC05HEd/mzFW8pU="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; - nativeCheckInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ "libvirt" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://libvirt.org/python.html"; From b5b9716c08de14d667057ea61b094f14f89239ae Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 21 May 2024 13:18:44 +0900 Subject: [PATCH 130/311] python311Packages.amazon-kclpy: 2.1.3 -> 2.1.4 Diff: https://github.com/awslabs/amazon-kinesis-client-python/compare/refs/tags/v2.1.3...v2.1.4 --- .../python-modules/amazon-kclpy/default.nix | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 4a95e7860311..194533084a0d 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -2,45 +2,48 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + fetchpatch, + setuptools, mock, - boto, - pytest, + boto3, + pytestCheckHook, }: buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.3"; - format = "setuptools"; + version = "2.1.4"; + pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3BhccRJd6quElXZSix1aVIqWr9wdcTTziDhnIOLiPPo="; + hash = "sha256-TWIGu7WuoaPhk8cz+hMXvGLIPQ5kly8aj20ZtvTZzwg="; }; - # argparse is just required for python2.6 - prePatch = '' - substituteInPlace setup.py \ - --replace "'argparse'," "" - ''; - - propagatedBuildInputs = [ - mock - boto + patches = [ + (fetchpatch { + name = "remove-deprecated-boto.patch"; + url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch"; + hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY="; + }) ]; - nativeCheckInputs = [ pytest ]; + build-system = [ setuptools ]; - checkPhase = '' - ${python.interpreter} -m pytest - ''; + dependencies = [ + mock + boto3 + ]; + + pythonImportsCheck = [ "amazon_kclpy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Amazon Kinesis Client Library for Python"; homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; - license = licenses.amazonsl; + license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; } From 3260679a3e3ca3faebe21e1c515913d657c3c402 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 21 May 2024 13:54:27 +0900 Subject: [PATCH 131/311] python311Packages.amazon-kclpy: mark as broken amazon-kclpy requires download of jar files at build time, but we don't know how to handle that --- pkgs/development/python-modules/amazon-kclpy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 194533084a0d..3186ade26999 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -45,5 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; + broken = true; }; } From 4ee52f7c866a202f766e98a496fae157140b9d92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 16:13:13 +0000 Subject: [PATCH 132/311] hunt: 2.3.0 -> 2.4.0 --- pkgs/tools/misc/hunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index 6163e8cf3b0d..69b9de8f7e3d 100644 --- a/pkgs/tools/misc/hunt/default.nix +++ b/pkgs/tools/misc/hunt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hunt"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "LyonSyonII"; repo = "hunt-rs"; rev = "v${version}"; - sha256 = "sha256-cpqietS/yTI5ONkH4jjIUOVATutd2vj9xmxRbBwmzeI="; + sha256 = "sha256-NKXZECtepuFg6qTuXF9Gnat/vnrygt3UOZb0YUKPqi8="; }; - cargoHash = "sha256-LWZaU+zHbfiogWXW9XGA3iP95u3qqh2LX9LL2lsQPLg="; + cargoHash = "sha256-ExwcFJVqQF/RTUyv1FvOCnlB+9Z7uhi/5UUjW7WcXTk="; meta = with lib; { description = "Simplified Find command made with Rust"; From 21af682addf88b3ddfa3ac09dc6d948132de3c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 16:14:16 +0000 Subject: [PATCH 133/311] cargo-chef: 0.1.66 -> 0.1.67 --- pkgs/development/tools/rust/cargo-chef/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 27cc6e1042d7..277bc441226b 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.66"; + version = "0.1.67"; src = fetchCrate { inherit pname version; - sha256 = "sha256-I4lD3+WFaW0kPmw5lPybDCRkG/at6VQH6l7pmngwoLU="; + sha256 = "sha256-5bvA3lss+F2Wx0SSx5KRCmpERdIXUkUhFP+zRn8aZH0="; }; - cargoHash = "sha256-tSr4m10zS+/JynGmNY0+aoiYDATYwuyfr1VGKmIkHg4="; + cargoHash = "sha256-EIpi1k5GffGCk+fzHSW32T+ZLkRfswnEGZdER95TyBk="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; From c95f96710519ba3d1b7bdfdff95b9b8c88498a31 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 22 May 2024 18:23:44 +0200 Subject: [PATCH 134/311] mrtg: add ipv6-required perl packages --- pkgs/tools/misc/mrtg/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 343a3d5c2a25..58882f3be00a 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -1,5 +1,11 @@ { lib, stdenv, fetchurl, perl, gd, rrdtool }: +let + perlWithPkgs = perl.withPackages (pp: with pp;[ + Socket6 + IOSocketINET6 + ]); +in stdenv.mkDerivation rec { pname = "mrtg"; version = "2.17.10"; @@ -10,7 +16,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl + # add support for ipv6 snmp: + # https://github.com/oetiker/mrtg/blob/433ebfa5fc043971b46a5cd975fb642c76e3e49d/src/bin/mrtg#L331-L341 + perlWithPkgs gd rrdtool ]; From 0864c89be75e51c2343b9bb39d2fdd524a999de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 16:53:13 +0000 Subject: [PATCH 135/311] corectrl: 1.4.0 -> 1.4.1 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index a7397da8d7cf..9240635aa542 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-zTH7iSPN7VIhXvWFndOulvGnfUZ+uGWnW53WcnSW+e4="; + sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; }; patches = [ ./polkit-dir.patch From 299c0dad477f0102bcbe20448618a3a65b9b08d1 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Sat, 20 Apr 2024 15:29:22 +0200 Subject: [PATCH 136/311] CONTRIBUTING.md: Add nixpkgs-merge-bot usage paragraph --- CONTRIBUTING.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3623246f6871..23a826d9a7b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -330,7 +330,14 @@ Container system, boot system and library changes are some examples of the pull ## How to merge pull requests [pr-merge]: #how-to-merge-pull-requests -The *Nixpkgs committers* are people who have been given +To streamline automated updates, leverage the nixpkgs-merge-bot by simply commenting `@NixOS/nixpkgs-merge-bot merge`. The bot will verify if the following conditions are met, refusing to merge otherwise: + +- the commenter that issued the command should be among the package maintainers; +- the package should reside in `pkgs/by-name`. + +Further, nixpkgs-merge-bot will ensure all ofBorg checks (except the Darwin-related ones) are successfully completed before merging the pull request. Should the checks still be underway, the bot patiently waits for ofBorg to finish before attempting the merge again. + +For other pull requests, the *Nixpkgs committers* are people who have been given permission to merge. It is possible for community members that have enough knowledge and experience on a special topic to contribute by merging pull requests. From 22e99916c031bed4869663ffb67a4c9669024742 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 31 Mar 2023 19:27:17 -0400 Subject: [PATCH 137/311] python312Packages.visions: init at 0.7.6 --- .../python-modules/visions/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/visions/default.nix diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix new file mode 100644 index 000000000000..6d3da09118f9 --- /dev/null +++ b/pkgs/development/python-modules/visions/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, attrs +, imagehash +, matplotlib +, multimethod +, networkx +, numpy +, pandas +, pillow +, pydot +, pygraphviz +, shapely +}: + +buildPythonPackage rec { + pname = "visions"; + version = "0.7.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dylan-profiler"; + repo = "visions"; + rev = "5fe9dd0c2a5ada0162a005c880bac5296686a5aa"; # no 0.7.6 tag in github + hash = "sha256-SZzDXm+faAvrfSOT0fwwAf9IH7upNybwKxbjw1CrHj8="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + attrs + imagehash + multimethod + networkx + numpy + pandas + ]; + + passthru.optional-dependencies = { + type-geometry = [ shapely ]; + type-image-path = [ imagehash pillow ]; + plotting = [ matplotlib pydot pygraphviz ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + disabledTestPaths = [ + # requires running Apache Spark: + "tests/spark_/typesets/test_spark_standard_set.py" + ]; + + pythonImportsCheck = [ + "visions" + ]; + + meta = with lib; { + description = "Type system for data analysis in Python"; + homepage = "https://dylan-profiler.github.io/visions"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 150965f1d205..2cedb539dfd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16678,6 +16678,8 @@ self: super: with self; { virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + visions = callPackage ../development/python-modules/visions { }; + visitor = callPackage ../development/python-modules/visitor { }; vispy = callPackage ../development/python-modules/vispy { }; From 64f44ea88038d8e6e8ee10fb9ac086cd4580f141 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 31 Mar 2023 19:28:53 -0400 Subject: [PATCH 138/311] python312Packages.ydata-profiling: init at 4.8.3 --- .../ydata-profiling/default.nix | 103 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/development/python-modules/ydata-profiling/default.nix diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix new file mode 100644 index 000000000000..8ad3ac196714 --- /dev/null +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -0,0 +1,103 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, dacite +, htmlmin +, imagehash +, jinja2 +, matplotlib +, multimethod +, numba +, numpy +, pandas +, phik +, pyarrow +, pydantic +, pyyaml +, requests +, scipy +, seaborn +, statsmodels +, tqdm +, typeguard +, visions +, wordcloud +}: + +buildPythonPackage rec { + pname = "ydata-profiling"; + version = "4.8.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ydataai"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-tMwhoVnn65EvZK5NBvh/G36W8tH7I9qaL+NTK3IZVdI="; + }; + + preBuild = '' + echo ${version} > VERSION + ''; + + propagatedBuildInputs = [ + dacite + htmlmin + imagehash + jinja2 + matplotlib + multimethod + numba + numpy + pandas + phik + pydantic + pyyaml + requests + scipy + seaborn + statsmodels + tqdm + typeguard + visions + wordcloud + ]; + + nativeCheckInputs = [ + pytestCheckHook + pyarrow + ]; + disabledTestPaths = [ + # needs Spark: + "tests/backends/spark_backend" + # try to download data: + "tests/issues" + "tests/unit/test_console.py" + "tests/unit/test_dataset_schema.py" + "tests/unit/test_modular.py" + ]; + disabledTests = [ + # try to download data: + "test_decorator" + "test_example" + "test_load" + "test_urls" + ]; + + pythonImportsCheck = [ + "ydata_profiling" + ]; + + meta = with lib; { + description = "Create HTML profiling reports from Pandas DataFrames"; + homepage = "https://ydata-profiling.ydata.ai"; + changelog = "https://github.com/ydataai/ydata-profiling/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "ydata_profiling"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cedb539dfd9..d959609fbb63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17207,6 +17207,8 @@ self: super: with self; { yacs = callPackage ../development/python-modules/yacs { }; + ydata-profiling = callPackage ../development/python-modules/ydata-profiling { }; + ydiff = callPackage ../development/python-modules/ydiff { }; yeelight = callPackage ../development/python-modules/yeelight { }; From 5548205cd012f1ffdb63931cda112affa4b33035 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 17:54:40 +0000 Subject: [PATCH 139/311] dblab: 0.22.0 -> 0.23.0 --- pkgs/development/tools/database/dblab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/development/tools/database/dblab/default.nix index 52a0aefdcc93..0c9680c69289 100644 --- a/pkgs/development/tools/database/dblab/default.nix +++ b/pkgs/development/tools/database/dblab/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-eIkHaNFvXU9GGyYOH8lqzvwQQ6pz8zWeO4xY9jP25dU="; + hash = "sha256-PXIV9MLdBRTvXwvtKraX3530H/EDz+4HA7SeKyeEJB4="; }; vendorHash = "sha256-WzyH3Ja/Znk/9aavIoBQRpJVnGb5o/ded0g92MTa4M4="; From 94f9b02b2b30077ec0e3a1311a729883e6e4a99b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 18:17:01 +0000 Subject: [PATCH 140/311] vintagestory: 1.19.7 -> 1.19.8 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 7134139c6250..e16b36ff67e5 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.7"; + version = "1.19.8"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-C+vPsoMlo6EKmzf+XkvIhrDGG7EccU8c36GZt0/1r1Q="; + hash = "sha256-R6J+ACYDQpOzJZFBizsQGOexR7lMyeoZqz9TnWxfwyM="; }; From e4a9014095bee9805f4fd62ea9c02e0eef8b7eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 18:20:26 +0000 Subject: [PATCH 141/311] jose: 13 -> 14 --- pkgs/development/libraries/jose/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 967886ae86c6..39e10e2dbebd 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-XkYvBjPmwhwo2p8/jTXazHRAgSGkI7LTLUlqbxMxlys="; + hash = "sha256-rMNPJaCtVpbwIkMQzBNpmRct6S/NelTwjmsuB0RP6R8="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; From c9fe76d1f9cd4ace687f9ec420a99b2dbef1378b Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 22 May 2024 20:22:07 +0200 Subject: [PATCH 142/311] forgejo: 7.0.2 -> 7.0.3 https://codeberg.org/forgejo/forgejo/releases/tag/v7.0.3 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#7-0-3 diff: https://codeberg.org/forgejo/forgejo/compare/v7.0.2...v7.0.3 --- pkgs/by-name/fo/forgejo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 90c725c74e74..ade722176d0b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw="; + npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww="; + hash = "sha256-P+HVZmfNA1ao+fQ253tK8A2DNGNPxvdyzCvByQJ0FGA="; }; - vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; + vendorHash = "sha256-8qMpnGL5GXJuxOpxh9a1Bcxd7tVweUKwbun8UBxCfQA="; subPackages = [ "." ]; From b8d9848dcbedf97f726aa26fd345aabefb9dc8b3 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 22 May 2024 20:34:49 +0200 Subject: [PATCH 143/311] CODEOWNERS: fix forgejo package path This slipped through the pkgs/by-name move in 3b4dad9b001a2c5cbc4282bb4b842903bbdeac2d. --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 47d5d399f198..b91f753015eb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -307,7 +307,7 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag # Forgejo nixos/modules/services/misc/forgejo.nix @bendlas @emilylange -pkgs/applications/version-management/forgejo @bendlas @emilylange +pkgs/by-name/fo/forgejo/package.nix @bendlas @emilylange # Dotnet /pkgs/build-support/dotnet @IvarWithoutBones From b745fcc7dd1753af6b1d0312000ab67deb15b724 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 20 May 2024 17:57:27 +0200 Subject: [PATCH 144/311] python3Packages.ppscore: fix build with pandas 2 Signed-off-by: Sefa Eyeoglu --- pkgs/development/python-modules/ppscore/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ppscore/default.nix b/pkgs/development/python-modules/ppscore/default.nix index 5593205dba6f..f523ffce1c82 100644 --- a/pkgs/development/python-modules/ppscore/default.nix +++ b/pkgs/development/python-modules/ppscore/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonRelaxDepsHook, setuptools, pandas, pytestCheckHook, @@ -23,7 +24,10 @@ buildPythonPackage rec { hash = "sha256-gJStsL8fN17kvXO8EH/NHGIBelPknJzYw5WEvHsFooU="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; propagatedBuildInputs = [ pandas @@ -32,6 +36,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "pandas" ]; + pythonImportsCheck = [ "ppscore" ]; meta = with lib; { From fde85503c52f3274a2647f51a8bc682a3aa44244 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 19:14:54 +0000 Subject: [PATCH 145/311] csvlens: 0.9.0 -> 0.9.1 --- pkgs/by-name/cs/csvlens/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index 7840dba022d2..1731af4bebce 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; rev = "refs/tags/v${version}"; - hash = "sha256-Qpda9qADnj3eGz+nvD6VgxUOwTXrFI1rMam6+sfK6MQ="; + hash = "sha256-22IU+TpmmJNCsjrobXe0+0YhssbFMt/j9Vusz69lips="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-PDOuAz+ov1S7i7TpRp4YaeoQQJ4paal6FI0VU25d4zU="; + cargoHash = "sha256-jLoVuDoarq6ZIWrNw04eyRo+M4jNcZ2zsMWKmZaDPf0="; meta = with lib; { description = "Command line csv viewer"; From eb85129277d5b49163f94f415fe78b96b0fc6cb9 Mon Sep 17 00:00:00 2001 From: Dennis Wuitz Date: Mon, 13 May 2024 16:38:05 +0200 Subject: [PATCH 146/311] python312Packages.django-ratelimit: init at 4.1.0 --- .../django-ratelimit/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/django-ratelimit/default.nix diff --git a/pkgs/development/python-modules/django-ratelimit/default.nix b/pkgs/development/python-modules/django-ratelimit/default.nix new file mode 100644 index 000000000000..ca0216a9de5c --- /dev/null +++ b/pkgs/development/python-modules/django-ratelimit/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, django +, django-redis +, fetchFromGitHub +, pymemcache +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "django-ratelimit"; + version = "4.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jsocol"; + repo = "django-ratelimit"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZMtZSKOIIRSqH6eyC7bBeua7YLKyWW6NOXN/MDv9fy4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + django + django-redis + pymemcache + ]; + + pythonImportsCheck = [ + "django_ratelimit" + ]; + + checkPhase = '' + runHook preCheck + + export DJANGO_SETTINGS_MODULE=test_settings + python -m django test django_ratelimit + + runHook postCheck + ''; + + + meta = with lib; { + description = "Cache-based rate-limiting for Django"; + homepage = "https://github.com/jsocol/django-ratelimit"; + changelog = "https://github.com/jsocol/django-ratelimit/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 632a66425b20..17d113c01d11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3300,6 +3300,8 @@ self: super: with self; { django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-ratelimit = callPackage ../development/python-modules/django-ratelimit { }; + django-raster = callPackage ../development/python-modules/django-raster { }; django-redis = callPackage ../development/python-modules/django-redis { }; From 4474e40f3b10e9e7f5978cd64bd3c7e356443684 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 19:35:03 +0000 Subject: [PATCH 147/311] svtplay-dl: 4.73 -> 4.79 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5abdb5bba60d..6b540fac7ffd 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -15,7 +15,7 @@ let python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; - version = "4.73"; + version = "4.79"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-e8ewsx2mx62JTUnpMoSRL44EGDllQuk/k9gRztOkWMc="; + hash = "sha256-m5lIiWOROzNUONAVRoD6vdE7+1TeI6L0tNw+afYtNZA="; }; pythonPaths = [ cryptography pyyaml requests ]; From b2ab986512e6fb55429e5a8e757f760443ebef0c Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 22 May 2024 21:56:34 +0200 Subject: [PATCH 148/311] python311Packages.gmpy2: disable failing test on Darwin --- .../development/python-modules/gmpy2/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 7bf82ed02b2d..58f4cc08f672 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -51,11 +51,17 @@ buildPythonPackage rec { mpmath ]; - disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # issue with some overflow logic - "test_mpz_to_bytes" - "test_mpz_from_bytes" - ]; + disabledTests = + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # issue with some overflow logic + "test_mpz_to_bytes" + "test_mpz_from_bytes" + ] + ++ lib.optionals stdenv.isDarwin [ + # TypeError: mpq() requires numeric or string argument + # not sure why it only fails on Darwin + "test_mpq_from_Decimal" + ]; pythonImportsCheck = [ "gmpy2" ]; From f40d6fcb1574cfaa4d5155429b7181abba3c10f0 Mon Sep 17 00:00:00 2001 From: Sven Mattsen Date: Wed, 22 May 2024 22:15:34 +0200 Subject: [PATCH 149/311] kubectl-klock: 0.6.1 -> 0.7.0 Diff: https://github.com/applejag/kubectl-klock/compare/v0.6.1...v0.7.0 Changelog: https://github.com/applejag/kubectl-klock/releases/tag/v0.7.0 --- .../networking/cluster/kubectl-klock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 06ede90ffb67..7bb18112e772 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.6.1"; + version = "0.7.0"; nativeBuildInputs = [ makeWrapper ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "applejag"; repo = pname; rev = "v${version}"; - hash = "sha256-QzleoHRQ/A5ImMl43kze5ppUdiLa4n/VT02lMnaXVkg="; + hash = "sha256-MmsHxB15gCz2W2QLC6E7Ao+9iLyVaYJatUgPcMuL79M="; }; - vendorHash = "sha256-smE8mdyZ8xJOevgHs4+ozS6VOlko+Whhs/37B+hIbxo="; + vendorHash = "sha256-lhawUcjB2EULpAFjBM4tdmDo08za2DfyZUvEPo4+LXE="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete From 8fb0463e14057185b24f59742fe265aca1024c5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 10:37:28 +0200 Subject: [PATCH 150/311] python312Packages.caio: refactor --- pkgs/development/python-modules/caio/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index f8c3df017a8a..201b41513aef 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -7,22 +7,27 @@ pytest-aiohttp, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "caio"; version = "0.9.13"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mosquito"; - repo = pname; + repo = "caio"; rev = "refs/tags/${version}"; hash = "sha256-Q87NuL6yZ5uKImQqqdKTMWNyfUOb4NaZDEvNdqZbHDk="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ aiomisc pytest-aiohttp From c5d6031aa165916b9b7008d101d62dd12fd17b53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 10:39:17 +0200 Subject: [PATCH 151/311] ython312Packages.caio: format with nixfmt --- pkgs/development/python-modules/caio/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 201b41513aef..61a2a6ecb4e7 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -24,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-Q87NuL6yZ5uKImQqqdKTMWNyfUOb4NaZDEvNdqZbHDk="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ aiomisc From 6ed48bd4fd53207a123ae5ffa8648fb67e6dc0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 22 May 2024 22:25:03 +0200 Subject: [PATCH 152/311] rspamd: use system libraries --- pkgs/servers/mail/rspamd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 2675ab7cbdd1..dd34e5cc2a62 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -2,6 +2,8 @@ , lib , fetchFromGitHub , cmake +, doctest +, fmt , perl , glib , luajit @@ -17,6 +19,8 @@ , lapack , lua , libsodium +, xxHash +, zstd , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 @@ -39,7 +43,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ cmake pkg-config perl ]; - buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] + buildInputs = [ doctest fmt glib openssl pcre sqlite ragel icu jemalloc libsodium xxHash zstd ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; @@ -53,6 +57,10 @@ stdenv.mkDerivation rec { "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" "-DENABLE_JEMALLOC=ON" + "-DSYSTEM_DOCTEST=ON" + "-DSYSTEM_FMT=ON" + "-DSYSTEM_XXHASH=ON" + "-DSYSTEM_ZSTD=ON" ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON" ++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF"; From 0fe3122fd035595681b2b9e4c110d41db640e39e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 20:28:03 +0000 Subject: [PATCH 153/311] gerrit: 3.9.4 -> 3.10.0 --- pkgs/applications/version-management/gerrit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 41179dfd0bcd..e8bcdb33a95e 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.9.4"; + version = "3.10.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-pjrWXfae1momJRTfdIPalsLynAGwqp1VtX9M9uqzJwM="; + hash = "sha256-mlaXCRQlqg2uwzm2/Vi15K5D6lmUUscfZQk/lW1YR+s="; }; buildCommand = '' From b3f2b745c4e8ef8c04a4c707ab7152bf42c54738 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 22:47:22 +0200 Subject: [PATCH 154/311] python312Packages.chromadb: limit platform support --- pkgs/development/python-modules/chromadb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index 471b6111a93d..ed4c8d541a14 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -150,10 +150,11 @@ buildPythonPackage rec { meta = with lib; { description = "The AI-native open-source embedding database"; - mainProgram = "chroma"; homepage = "https://github.com/chroma-core/chroma"; changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "chroma"; + broken = stdenv.isLinux && stdenv.isAarch64; }; } From e5217101fd79e3e4d5261fca7046449e8ac0f7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 20:51:25 +0000 Subject: [PATCH 155/311] traefik: 3.0.0 -> 3.0.1 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 3e429e3595f7..ff27da98ad5c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "3.0.0"; + version = "3.0.1"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-OX9VJpO+SWIsocaSu+BhF3HT+zrhhgxb5NBvaRTadIY="; + hash = "sha256-FoKmoestbPu95E4dzBdG2rB0zEYocD/16yt9Je4M3GU="; stripRoot = false; }; - vendorHash = "sha256-GRVSZB4GojXv2xAdx8Y5RSuhF/3paRhhq7HOWLRmmHE="; + vendorHash = "sha256-nEPcq4lUvs/hTobciIZAQKQ13MgKMLjYUkyYMd3EHms="; subPackages = [ "cmd/traefik" ]; From 0bf01df013d531c2ed02becff7eb51aa2a38c877 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 20:52:25 +0000 Subject: [PATCH 156/311] regal: 0.21.3 -> 0.22.0 --- pkgs/by-name/re/regal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index d97004f6439b..dd767a21d643 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "regal"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-MeEamVAETl+PJXJ2HpbhYdEG3kqvEeT5bGzRHyTrjcY="; + hash = "sha256-3Q37ukeqf3n8UhriQNCWyRCgWOcxwO4TsNcsEnJn5eg="; }; - vendorHash = "sha256-5rj2dCWya24VUmIFf0oJQop80trq9NnqqFlBW/A6opk="; + vendorHash = "sha256-ejTBfoDYMt5Jpuq+uNgpdHCafR7IUVr8OFB84+m/ZFg="; meta = with lib; { description = "a linter and language server for Rego"; From 09756613cca7bbc4b014b4625cfd83b8bb99ce4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 16:03:09 +0200 Subject: [PATCH 157/311] python311Packages.pyannote-metrics: refactor - remove vendorized versioneer.py - update build-system - disable on unsupported Python releases --- .../pyannote-metrics/default.nix | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix index f5623e28b440..27d825a2859c 100644 --- a/pkgs/development/python-modules/pyannote-metrics/default.nix +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -1,19 +1,20 @@ { lib, buildPythonPackage, + docopt, fetchFromGitHub, - setuptools, - wheel, + matplotlib, + numpy, + pandas, pyannote-core, pyannote-database, - pandas, - scipy, + pythonOlder, scikit-learn, - docopt, - tabulate, - matplotlib, + scipy, + setuptools, sympy, - numpy, + tabulate, + versioneer, }: buildPythonPackage rec { @@ -21,14 +22,26 @@ buildPythonPackage rec { version = "3.2.1"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-metrics"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-V4qyaCaFsoikfFILm2sccf6m7lqJSDTdLxS1sr/LXAY="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ pyannote-core pyannote-database pandas @@ -41,18 +54,14 @@ buildPythonPackage rec { numpy ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - pythonImportsCheck = [ "pyannote.metrics" ]; meta = with lib; { description = "A toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; - mainProgram = "pyannote-metrics"; homepage = "https://github.com/pyannote/pyannote-metrics"; + changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "pyannote-metrics"; }; } From c236d8b8a5983565b7fd7513bbb3da04f852abc3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 21 May 2024 22:34:42 +0200 Subject: [PATCH 158/311] python311Packages.huggingface-hub: 0.23.0 -> 0.23.1 Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.23.0...v0.23.1 Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.23.1 --- .../python-modules/huggingface-hub/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index c8a198c57bba..993316e030f6 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-FfevPGec++3auA4Zxu84mhpD0RGatcPgDKi7LkmOVss="; + hash = "sha256-xMtCyYVstHLgX4++IlJ4ON/2vhMa6oafhMkdxk3+yGQ="; }; build-system = [ setuptools ]; @@ -44,12 +44,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "huggingface_hub" ]; - meta = with lib; { + meta = { description = "Download and publish models and other files on the huggingface.co hub"; mainProgram = "huggingface-cli"; homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 380ab7da32c133b434dbc2e1831ca9d21dab211c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 22 May 2024 23:06:36 +0200 Subject: [PATCH 159/311] python311Packages.transformers: 4.41.0 -> 4.41.1 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.41.0...v4.41.1 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.41.1 --- .../python-modules/transformers/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 5db1c4b3b12f..824d607cc380 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.41.0"; + version = "4.41.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-FUYQeEksjDasFvQraycNFAx3cLHfDdPpgZssqN8OIJw="; + hash = "sha256-eUMdlqHjCmK51hUPxjZq3tOl0o6EjipOziWergHwmPk="; }; build-system = [ setuptools ]; @@ -186,14 +186,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "transformers" ]; - meta = with lib; { + meta = { homepage = "https://github.com/huggingface/transformers"; description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; mainProgram = "transformers-cli"; changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ pashashocky happysalada ]; From 8212628254fceb6242130da9eedba952ba306962 Mon Sep 17 00:00:00 2001 From: Jan van Esdonk Date: Wed, 22 May 2024 23:09:04 +0200 Subject: [PATCH 160/311] python311Packages.dask-expr: fix src hash --- pkgs/development/python-modules/dask-expr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 457a2b5ddf33..ea2de99a21e2 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-ltsRKbb/p+qHeNiX0oeZUKbbjPoPxSM4uFnWUFqoqhc="; + hash = "sha256-N+hvalSn8mwlAaN3Xhu+YxECORfLN4UHutwmeiGR9WI="; }; postPatch = '' From 78988dc6ed937c7ef29b79c14f756d30607d7804 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 23:24:58 +0200 Subject: [PATCH 161/311] python312Packages.circus: disable failing tests - refactor --- .../python-modules/circus/default.nix | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 7445dd1a6465..2a2d8e3c5d5f 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -6,6 +6,7 @@ flit-core, psutil, pytestCheckHook, + pythonOlder, pyyaml, pyzmq, tornado, @@ -14,16 +15,18 @@ buildPythonPackage rec { pname = "circus"; version = "0.18.0"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-GTzoIk4GjO1mckz0gxBvtmdLUaV1g6waDn7Xp+6Mcas="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ psutil pyzmq tornado @@ -41,38 +44,39 @@ buildPythonPackage rec { disabledTests = [ # these tests raise circus.tests.support.TimeoutException - "test_reload1" - "test_reload2" + "test_add_start" + "test_add" + "test_command_already_running" + "test_dummy" + "test_exits_within_graceful_timeout" + "test_full_stats" + "test_handler" + "test_handler" + "test_inherited" + "test_kills_after_graceful_timeout" + "test_launch_cli" + "test_max_age" "test_reload_sequential" "test_reload_uppercase" "test_reload_wid_1_worker" "test_reload_wid_4_workers" - "test_add" - "test_add_start" - "test_command_already_running" - "test_launch_cli" - "test_handler" + "test_reload1" + "test_reload2" "test_resource_watcher_max_cpu" - "test_resource_watcher_max_mem" "test_resource_watcher_max_mem_abs" + "test_resource_watcher_max_mem" "test_resource_watcher_min_cpu" - "test_resource_watcher_min_mem" "test_resource_watcher_min_mem_abs" - "test_full_stats" - "test_watchdog_discovery_found" - "test_watchdog_discovery_not_found" - "test_dummy" - "test_handler" + "test_resource_watcher_min_mem" + "test_set_before_launch" + "test_set_by_arbiter" + "test_signal" "test_stdin_socket" "test_stop_and_restart" "test_stream" - "test_inherited" - "test_set_before_launch" - "test_set_by_arbiter" - "test_max_age" - "test_signal" - "test_exits_within_graceful_timeout" - "test_kills_after_graceful_timeout" + "test_venv" + "test_watchdog_discovery_found" + "test_watchdog_discovery_not_found" # this test requires socket communication "test_plugins" ]; @@ -82,6 +86,8 @@ buildPythonPackage rec { meta = with lib; { description = "A process and socket manager"; homepage = "https://github.com/circus-tent/circus"; + changelog = "https://github.com/circus-tent/circus/releases/tag/${version}"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From 354f023b619552db656a881721486c85e0cc20df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 23:34:52 +0200 Subject: [PATCH 162/311] python312Packages.mutag: refactor --- .../python-modules/mutag/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index c0a173a7da9c..2d42f2008aa6 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -2,30 +2,39 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy3k, pyparsing, + pythonOlder, + setuptools, }: buildPythonPackage { pname = "mutag"; - version = "0.0.2-2ffa0258ca"; - format = "setuptools"; - disabled = !isPy3k; + version = "0.0.2-unstable-2018-08-20"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aroig"; repo = "mutag"; - rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; - hash = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; + rev = "9425169eb5d4aa9eb09f2809a09b83855b3acbef"; + hash = "sha256-fEMmFRoFyLkqusAuhdx3XEPaPsu1x86ACAz9Vkl9YfA="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "mutag" ]; meta = with lib; { - homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; - mainProgram = "mutag"; - license = licenses.gpl3; + homepage = "https://github.com/aroig/mutag"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; + mainProgram = "mutag"; }; } From dd846b37bc57af7a755394c78fef9544231e28b8 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Wed, 22 May 2024 13:32:12 +1200 Subject: [PATCH 163/311] oink: init at 1.1.1 --- pkgs/by-name/oi/oink/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/oi/oink/package.nix diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix new file mode 100644 index 000000000000..b7198abacc54 --- /dev/null +++ b/pkgs/by-name/oi/oink/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "oink"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "rlado"; + repo = "oink"; + rev = "v${version}"; + hash = "sha256-nSLoochU0mRxD83EXH3xsrfBBg4SnvIyf5qUiwSeh0c="; + }; + + vendorHash = null; + + postInstall = '' + mv $out/bin/src $out/bin/oink + ''; + + meta = { + description = "Dynamic DNS client for Porkbun"; + homepage = "https://github.com/rlado/oink"; + license = lib.licenses.mit; + mainProgram = "oink"; + maintainers = with lib.maintainers; [ jtbx ]; + }; +} From bef6c32d16861f788a1b6f5d691a083ddaaa29c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 21:41:15 +0000 Subject: [PATCH 164/311] fzf-make: 0.30.0 -> 0.32.0 --- pkgs/by-name/fz/fzf-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 864bb8f0c925..24756ffcf880 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-C2CDzcS6iE2ojXtFjQfHDJE2C1b5QNG6rda/MiDW8kk="; + hash = "sha256-JHquE35qe1nJFJ+0gniG72o1DrGLZSZ0do5oPHgYbHU="; }; - cargoHash = "sha256-N5hM5xTMNeryFgdICQcKvPt4lHgh02DCaPD3TTGmFBo="; + cargoHash = "sha256-61I6OiEP0t9DAF0jnIEyGRTpPBU65zz/W6mAo7XelVo="; nativeBuildInputs = [ makeBinaryWrapper ]; From 17f73d6f9ade07a11baf897b902e99b43d41ebea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 23:44:12 +0200 Subject: [PATCH 165/311] python312Packages.ics: disable failing test --- .../python-modules/ics/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index c347b177587c..2f973a6dc981 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ics-py"; @@ -25,9 +25,14 @@ buildPythonPackage rec { hash = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--pep8" "" + ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ attrs arrow tatsu @@ -38,18 +43,13 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # 0.8 will move to python-dateutil - substituteInPlace requirements.txt \ - --replace "arrow>=0.11,<0.15" "arrow" - substituteInPlace setup.cfg --replace "--pep8" "" - ''; - disabledTests = [ # Failure seems to be related to arrow > 1.0 "test_event" # Broke with TatSu 5.7: "test_many_lines" + # AssertionError: 'Europe/Berlin' not found in "tzfile('Atlantic/Jan_Mayen')" + "test_timezone_not_dropped" ]; pythonImportsCheck = [ "ics" ]; From b31765e614f083caa8ac7c436d4f656ec010be21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 21:55:58 +0000 Subject: [PATCH 166/311] gatekeeper: 3.16.0 -> 3.16.2 --- pkgs/applications/networking/cluster/gatekeeper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 5ddb8409d31f..290e542d0eca 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.16.0"; + version = "3.16.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-IIqucBPuEHymfg7nLmxXMrq1aaB6SFPrczPj4BH8Zyw="; + hash = "sha256-lpnli05nRKwEdG9k4j+pSAKxNoFBBeOhwd8iYbelwoc="; }; vendorHash = null; From 449e66ce85f23142d11de814945e4af76bba4d5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 23:58:41 +0200 Subject: [PATCH 167/311] python312Packages.tencentcloud-sdk-python: 3.0.1152 -> 3.0.1153 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1152...3.0.1153 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1153/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 1eee4a02da4f..de66abd7a2c2 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1152"; + version = "3.0.1153"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-pmmZnTvZwpVD/ECjKzA6LQ2c7McYznJMlKabcYwh3LY="; + hash = "sha256-BDBRE7AKT5rKWW62Sx5M5jtF+ANU//Z9AUt1Jh1wFpo="; }; build-system = [ setuptools ]; From 8028253b54c4af722a409397bdbbb6e6e4063d59 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 23 May 2024 00:01:27 +0200 Subject: [PATCH 168/311] pleroma: 2.6.2 -> 2.6.3 https://pleroma.social/announcements/2024/05/22/pleroma-security-release-2.6.3/ --- pkgs/servers/pleroma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 4f695b400893..15382071602f 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-KVB6e/B6DJbylpfR8QTZJ1GOJrAqF6shqoU/zIndi1U="; + sha256 = "sha256-ZiupcCu6ES/G9rsdNo5+JXOIPhb4CHT2YhKThWiLisw="; }; patches = [ From 77d685bc8200130f744140d3f05d130ed93d10f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 22:06:14 +0000 Subject: [PATCH 169/311] ttyplot: 1.6.4 -> 1.6.5 --- pkgs/tools/misc/ttyplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 64b9b7cddfab..b68e2ba0bc69 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-yxAFqi3TgiKiZYgR891ahkwUqZLk/JDsjujOYmBjUtk="; + hash = "sha256-DLFEnEo+EQuq4ziqo9qfyHGD1Zosk9Kb/80QjnI2aXk="; }; nativeBuildInputs = [ From 50c8f5e46df089d77f13e26ce03e606c050eb8b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 22 May 2024 22:11:16 +0000 Subject: [PATCH 170/311] limine: 7.5.1 -> 7.5.2 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 1a004b42f210..464c57dce72e 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.5.1"; + version = "7.5.2"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-aWzhUwW4799v0qZDpzzztb2LnfRYwjPXWM2dgpqwYIo="; + sha256 = "sha256-l9ax89rNbQs8eNyuljdEXCvY5GRXsN9qzIDrsi76iEg="; }; nativeBuildInputs = [ From 20fc095a1cfbbd570557220e14ecb8b69ee143c0 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Wed, 22 May 2024 13:32:12 +1200 Subject: [PATCH 171/311] nixos/oink: init module --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/oink.nix | 84 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 nixos/modules/services/networking/oink.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 484cc4a3b672..a22952130f5d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -135,6 +135,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [nh](https://github.com/viperML/nh), yet another Nix CLI helper. Available as [programs.nh](#opt-programs.nh.enable). +- [oink](https://github.com/rlado/oink), a dynamic DNS client for Porkbun. Available as [services.oink](#opt-services.oink.enable). + - [ollama](https://ollama.ai), server for running large language models locally. - [ownCloud Infinite Scale Stack](https://owncloud.com/infinite-scale-4-0/), a modern and scalable rewrite of ownCloud. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 70482bffed56..e1c63afc2b90 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1109,6 +1109,7 @@ ./services/networking/ocserv.nix ./services/networking/ofono.nix ./services/networking/oidentd.nix + ./services/networking/oink.nix ./services/networking/onedrive.nix ./services/networking/openconnect.nix ./services/networking/openvpn.nix diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix new file mode 100644 index 000000000000..cd0fdf172331 --- /dev/null +++ b/nixos/modules/services/networking/oink.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.oink; + makeOinkConfig = attrs: (pkgs.formats.json { }).generate + "oink.json" (mapAttrs' (k: v: nameValuePair (toLower k) v) attrs); + oinkConfig = makeOinkConfig { + global = cfg.settings; + domains = cfg.domains; + }; +in +{ + options.services.oink = { + enable = mkEnableOption "Oink, a dynamic DNS client for Porkbun"; + package = mkPackageOption pkgs "oink" { }; + settings = { + apiKey = mkOption { + type = types.str; + description = "API key to use when modifying DNS records."; + }; + secretApiKey = mkOption { + type = types.str; + description = "Secret API key to use when modifying DNS records."; + }; + interval = mkOption { + # https://github.com/rlado/oink/blob/v1.1.1/src/main.go#L364 + type = types.ints.between 60 172800; # 48 hours + default = 900; + description = "Seconds to wait before sending another request."; + }; + ttl = mkOption { + type = types.ints.between 600 172800; + default = 600; + description = '' + The TTL ("Time to Live") value to set for your DNS records. + + The TTL controls how long in seconds your records will be cached + for. A smaller value will allow the record to update quicker. + ''; + }; + }; + domains = mkOption { + type = with types; listOf (attrsOf anything); + default = []; + example = [ + { + domain = "nixos.org"; + subdomain = ""; + ttl = 1200; + } + { + domain = "nixos.org"; + subdomain = "hydra"; + } + ]; + description = '' + List of attribute sets containing configuration for each domain. + + Each attribute set must have two attributes, one named *domain* + and another named *subdomain*. The domain attribute must specify + the root domain that you want to configure, and the subdomain + attribute must specify its subdomain if any. If you want to + configure the root domain rather than a subdomain, leave the + subdomain attribute as an empty string. + + Additionally, you can use attributes from *services.oink.settings* + to override settings per-domain. + + Every domain listed here *must* have API access enabled in + Porkbun's control panel. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.oink = { + description = "Dynamic DNS client for Porkbun"; + wantedBy = [ "multi-user.target" ]; + script = "${cfg.package}/bin/oink -c ${oinkConfig}"; + }; + }; +} From a1b213fc1b12c98d4fc623d9b189bf34db09e428 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:12:54 +0200 Subject: [PATCH 172/311] python312Packages.tabula-py: 2.9.1 -> 2.9.3 Diff: https://github.com/chezou/tabula-py/compare/refs/tags/v2.9.1...v2.9.3 Changelog: https://github.com/chezou/tabula-py/releases/tag/v2.9.3 --- pkgs/development/python-modules/tabula-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 4556443136b2..0299d511c25a 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.9.1"; + version = "2.9.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "chezou"; repo = "tabula-py"; rev = "refs/tags/v${version}"; - hash = "sha256-C06du4mhpnF2qxcEMZxp5O/8xpNaj9Jp8LFaxBkGF/Q="; + hash = "sha256-dEcVIlK3M7zqRMN7W7mnnMPWhM2A4/qvf0aY61ko4yE="; }; postPatch = '' From 61f72d3d978d71cfb53af3fe308c30d8e8c0ebd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:16:03 +0200 Subject: [PATCH 173/311] python312Packages.pydeconz: 115 -> 116 Diff: https://github.com/Kane610/deconz/compare/refs/tags/v115...v116 Changelog: https://github.com/Kane610/deconz/releases/tag/v116 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 40635ad93fcc..76fbae16299b 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "115"; + version = "116"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-NjzONVSJ4GEaIeC5ytnTi8JpZY1yIq3LN8vbMy3n0vs="; + hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8="; }; postPatch = '' From 7575e7c2d0eff37987ec33431676cd0a09742651 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:18:17 +0200 Subject: [PATCH 174/311] python312Packages.oras: 0.1.29 -> 0.1.30 Diff: https://github.com/oras-project/oras-py/compare/refs/tags/0.1.29...0.1.30 Changelog: https://github.com/oras-project/oras-py/blob/0.1.30/CHANGELOG.md --- pkgs/development/python-modules/oras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index 16a8a9d9fd6b..987b41dfaa2d 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.1.29"; + version = "0.1.30"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; rev = "refs/tags/${version}"; - hash = "sha256-ZV+J5zqRBRIddWdmLzzjpZi3M5E/HfkG8lWK9xzy5tw="; + hash = "sha256-qdWGqa5W+WI+lQ2TDZUuJF7PSmkc1Kv7UbWL6+Rfyio="; }; build-system = [ setuptools ]; From 4c8a1f21c4acacd16687bf474d281029f7b6a194 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:24:16 +0200 Subject: [PATCH 175/311] python312Packages.notifications-python-client: 9.0.0 -> 9.1.0 Diff: https://github.com/alphagov/notifications-python-client/compare/refs/tags/9.0.0...9.1.0 Changelog: https://github.com/alphagov/notifications-python-client/blob/9.1.0/CHANGELOG.md --- .../python-modules/notifications-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notifications-python-client/default.nix b/pkgs/development/python-modules/notifications-python-client/default.nix index 3ec2874c4591..1915ccd3fee9 100644 --- a/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/pkgs/development/python-modules/notifications-python-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "notifications-python-client"; - version = "9.0.0"; + version = "9.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "alphagov"; repo = "notifications-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-HDxCVwagHFenx0S2TPxiMIyyq4ovxe0yNi76sX2CC9s="; + hash = "sha256-qjiI+aTJLOz3XSTHKrpZrJ/wg1xP+V7ww0//xX3Kf1E="; }; postPatch = '' From aec2a458358d303e46ea38d4f446162214111ea8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:25:12 +0200 Subject: [PATCH 176/311] python312Packages.microsoft-kiota-abstractions: 1.3.2 -> 1.3.3 Diff: https://github.com/microsoft/kiota-abstractions-python/compare/refs/tags/v1.3.2...v1.3.3 Changelog: https://github.com/microsoft/kiota-abstractions-python/blob/1.3.3/CHANGELOG.md --- .../python-modules/microsoft-kiota-abstractions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index a92965db3398..dfe65b63c454 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-abstractions-python"; rev = "refs/tags/v${version}"; - hash = "sha256-n9Erm21slKm+zDblhSHA5Cwxkyrcyx0w09ua3bUc5XI="; + hash = "sha256-TgHj5Ga6Aw/sN2Hobn0OocFB/iGRHTKEeOa2j2aqnRY="; }; build-system = [ flit-core ]; From 6874098038e318094a13e2ca14097b87edb95a99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:26:08 +0200 Subject: [PATCH 177/311] python312Packages.mkdocstrings-python: 1.10.2 -> 1.10.3 Diff: https://github.com/mkdocstrings/python/compare/refs/tags/1.10.2...1.10.3 Changelog: https://github.com/mkdocstrings/python/blob/1.10.3/CHANGELOG.md --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 5e634d2da0ea..67ad47544107 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-Dz74q7bsa8bInxn4RpP9MFXFDEL2yWifDe64K8AOl8k="; + hash = "sha256-OiG/dPsWO2Z4lGUlgPePRcsrotCu+fwesKhhh6YjmnU="; }; build-system = [ pdm-backend ]; From 5a8e22e8b37d20bb9c4a6764dfd26a50fcf8b01a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:26:47 +0200 Subject: [PATCH 178/311] python312Packages.life360: 6.0.1 -> 7.0.0 Diff: https://github.com/pnbruckner/life360/compare/refs/tags/v6.0.1...v7.0.0 Changelog: https://github.com/pnbruckner/life360/releases/tag/v7.0.0 --- pkgs/development/python-modules/life360/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 89a097d6e565..353eceb64dd0 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "life360"; - version = "6.0.1"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-USqSkjOHlH0K/RlRYpn/gz6dHW8/uEVpsc4HeUZ3Emg="; + hash = "sha256-+fvzZ1IsPsXLTcfR7vrE4n1nF7CdvoL4BzDJMsDBZVY="; }; propagatedBuildInputs = [ aiohttp ]; From 2f45cbe1c2d328d2dc72ff23e81ddbfd3d42feca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:29:35 +0200 Subject: [PATCH 179/311] python312Packages.life360: refactor --- pkgs/development/python-modules/life360/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 353eceb64dd0..d8774ff34453 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -5,31 +5,34 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "life360"; version = "7.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pnbruckner"; - repo = pname; + repo = "life360"; rev = "refs/tags/v${version}"; hash = "sha256-+fvzZ1IsPsXLTcfR7vrE4n1nF7CdvoL4BzDJMsDBZVY="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; - # Project has no tests + dependencies = [ aiohttp ]; + + # Module has no tests doCheck = false; pythonImportsCheck = [ "life360" ]; meta = with lib; { - description = "Python module to interact with Life360"; + description = "Module to interact with Life360"; homepage = "https://github.com/pnbruckner/life360"; changelog = "https://github.com/pnbruckner/life360/releases/tag/v${version}"; license = licenses.mit; From f0246f77963f3f184c8d4d5363f4b9e935993799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:30:41 +0200 Subject: [PATCH 180/311] python312Packages.ha-philipsjs: 3.1.1 -> 3.2.1 Diff: https://github.com/danielperna84/ha-philipsjs/compare/refs/tags/3.1.1...3.2.1 Changelog: https://github.com/danielperna84/ha-philipsjs/releases/tag/3.2.1 --- pkgs/development/python-modules/ha-philipsjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 939dfdd8afca..be6a4de5d40a 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "3.1.1"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-r8uqToxkJg9j89UUZpxsPXutWPefAYDW95zFBKU9Al4="; + hash = "sha256-gN7TPbNGw1vT0oAE6+Kg4V3J5dhYH+Gvv3JwptQ2aMk="; }; propagatedBuildInputs = [ From 1896b9a5b861d116583a20b2bad85ed3b4268293 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:32:25 +0200 Subject: [PATCH 181/311] python312Packages.ha-philipsjs: refactor --- .../python-modules/ha-philipsjs/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index be6a4de5d40a..805665b2b756 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -9,23 +9,26 @@ pytestCheckHook, pythonOlder, respx, + setuptools, }: buildPythonPackage rec { pname = "ha-philipsjs"; version = "3.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "danielperna84"; - repo = pname; + repo = "ha-philipsjs"; rev = "refs/tags/${version}"; hash = "sha256-gN7TPbNGw1vT0oAE6+Kg4V3J5dhYH+Gvv3JwptQ2aMk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography httpx ]; @@ -40,7 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "haphilipsjs" ]; meta = with lib; { - description = "Python library to interact with Philips TVs with jointSPACE API"; + description = "Library to interact with Philips TVs with jointSPACE API"; homepage = "https://github.com/danielperna84/ha-philipsjs"; changelog = "https://github.com/danielperna84/ha-philipsjs/releases/tag/${version}"; license = licenses.mit; From d679ddfcab7ffe85f66f81d70ffd64e6e0951b1e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 23 May 2024 06:06:57 +0800 Subject: [PATCH 182/311] nixos/kanata: add a configFile option This brings two benefits. For one thing, it exposes the generated config file which users can build separately to validate it. For another, it allows users to provide their own config file. --- nixos/modules/services/hardware/kanata.nix | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index 46af3e36b985..60fb33881f25 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -7,7 +7,7 @@ let upstreamDoc = "See [the upstream documentation](https://github.com/jtroo/kanata/blob/main/docs/config.adoc) and [example config files](https://github.com/jtroo/kanata/tree/main/cfg_samples) for more information."; - keyboard = { + keyboard = { name, config, ... }: { options = { devices = mkOption { type = types.listOf types.str; @@ -48,6 +48,21 @@ let ${upstreamDoc} ''; }; + configFile = mkOption { + type = types.path; + default = mkConfig name config; + defaultText = + "A config file generated by values from other kanata module options."; + description = '' + The config file. + + By default, it is generated by values from other kanata + module options. + + You can also set it to your own full config file which + overrides all other kanata module options. ${upstreamDoc} + ''; + }; extraArgs = mkOption { type = types.listOf types.str; default = [ ]; @@ -85,6 +100,10 @@ let ${keyboard.config} ''; + # Only the config file generated by this module is checked. A + # user-provided one is not checked because it may not be available + # at build time. I think this is a good balance between module + # complexity and functionality. checkPhase = '' ${getExe cfg.package} --cfg "$target" --check --debug ''; @@ -96,7 +115,7 @@ let Type = "notify"; ExecStart = '' ${getExe cfg.package} \ - --cfg ${mkConfig name keyboard} \ + --cfg ${keyboard.configFile} \ --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ ${utils.escapeSystemdExecArgs keyboard.extraArgs} From d54c554d1487a03f6b2b32825c0428bca23a2501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:46:09 +0200 Subject: [PATCH 183/311] python312Packages.elastic-apm: 6.22.0 -> 6.22.2 Diff: https://github.com/elastic/apm-agent-python/compare/refs/tags/v6.22.0...v6.22.2 Changelog: https://github.com/elastic/apm-agent-python/releases/tag/v6.22.2 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 25ef39efea06..a9eccc7bbbc6 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.22.0"; + version = "6.22.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VuVx+QUiV4M/ebyv2uF/YZwfvcaPDJAEi55fXfoIttU="; + hash = "sha256-AHKF+o0iZ+c1JFq3lL5XdHBDAae9qTR1OJvwuUVsaeU="; }; pythonRelaxDeps = [ "wrapt" ]; From 3c468f4cee3cbe403c52ac7550c348ad38e5f3fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:47:28 +0200 Subject: [PATCH 184/311] python312Packages.elasticsearch8: 8.13.0 -> 8.13.1 Changelog: https://github.com/elastic/elasticsearch-py/releases/tag/v8.13.1 --- pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 9b9f77d177b0..611a1de2f08d 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.13.0"; + version = "8.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NWg+/dr8jXCCLeXBAXY1yL6/2CB0xCO5tswY4y/5erw="; + hash = "sha256-jVi5yYPll7ej8lmDEbvcLCEdBbpMiZUi2n4AORre81E="; }; nativeBuildInputs = [ elastic-transport ]; From b22d9f589d03252a8ca8db4e6820c4f724ef11fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:50:40 +0200 Subject: [PATCH 185/311] python312Packages.elasticsearch8: refactor --- .../python-modules/elasticsearch8/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 611a1de2f08d..27760df9b8e7 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -4,15 +4,17 @@ buildPythonPackage, elastic-transport, fetchPypi, + orjson, pythonOlder, requests, + setuptools, urllib3, }: buildPythonPackage rec { pname = "elasticsearch8"; version = "8.13.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,12 +23,14 @@ buildPythonPackage rec { hash = "sha256-jVi5yYPll7ej8lmDEbvcLCEdBbpMiZUi2n4AORre81E="; }; - nativeBuildInputs = [ elastic-transport ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ elastic-transport ]; passthru.optional-dependencies = { async = [ aiohttp ]; + requests = [ requests ]; + orjson = [ orjson ]; }; # Check is disabled because running them destroy the content of the local cluster! From 59371f7850aff754fc256b3fe324a83bcebdcbad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:52:12 +0200 Subject: [PATCH 186/311] python312Packages.losant-rest: 1.19.6 -> 1.19.7 Diff: https://github.com/Losant/losant-rest-python/compare/refs/tags/v1.19.6...v1.19.7 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 21a285711976..81157ed9d23e 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.6"; + version = "1.19.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "refs/tags/v${version}"; - hash = "sha256-sbNR95FhcRhgHh/ulLC8lL6EHal0BBK3wP6i29VElmY="; + hash = "sha256-gn8YTnCAmAcmQxpgtitk2eRy3spveuU0peeHu/iSnCE="; }; build-system = [ setuptools ]; From 93dee0ad87defe7b5093cb2f4454f9c7103f812e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:53:27 +0200 Subject: [PATCH 187/311] python312Packages.nibe: 2.9.0 -> 2.10.0 Diff: https://github.com/yozik04/nibe/compare/refs/tags/2.9.0...2.10.0 Changelog: https://github.com/yozik04/nibe/releases/tag/2.10.0 --- pkgs/development/python-modules/nibe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index e424523b6d8f..1c0d104f6370 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-j8P/lhBjlsmnOc4Cv/a2Hdf2EPO8CEpT4IOQHtiBgQA="; + hash = "sha256-g43lXQzsQ1Serq6oIMcnAYwUppdEVcBkYGEoy3NIwqo="; }; nativeBuildInputs = [ setuptools ]; From 98e406b1a92c51efbc9b2d23653bf4841d9c7a7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:54:40 +0200 Subject: [PATCH 188/311] python312Packages.nibe: refactor --- pkgs/development/python-modules/nibe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 1c0d104f6370..1df23ea573cb 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { hash = "sha256-g43lXQzsQ1Serq6oIMcnAYwUppdEVcBkYGEoy3NIwqo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ async-modbus async-timeout construct @@ -62,7 +62,7 @@ buildPythonPackage rec { description = "Library for the communication with Nibe heatpumps"; homepage = "https://github.com/yozik04/nibe"; changelog = "https://github.com/yozik04/nibe/releases/tag/${version}"; - license = with licenses; [ gpl3Plus ]; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } From ae18e3e998761659c485b7221a8949ed2a43480a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 00:58:01 +0200 Subject: [PATCH 189/311] python312Packages.wled: 0.17.1 -> 0.18.0 Diff: https://github.com/frenck/python-wled/compare/refs/tags/v0.17.1...v0.18.0 Changelog: https://github.com/frenck/python-wled/releases/tag/v0.18.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index c8eaedc38340..3dbdef76f1fb 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "refs/tags/v${version}"; - hash = "sha256-9682AbcADhd9m5XrYeDFiX+sJCCe+pnuvntJDnpzJ+U="; + hash = "sha256-0BJgbyDhCPFlHxlEry7Rh/j0nv3D3kRhIqCSW+Irhqk="; }; postPatch = '' From 4e30caab80e639b961bfdad21c956507ff03f947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:03:42 +0200 Subject: [PATCH 190/311] python312Packages.wled: refactor - add optional-dependencies --- .../python-modules/wled/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 3dbdef76f1fb..0836376c679d 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -1,24 +1,26 @@ { lib, aiohttp, + aresponses, awesomeversion, backoff, buildPythonPackage, cachetools, fetchFromGitHub, poetry-core, - yarl, - aresponses, pytest-asyncio, pytest-xdist, pytestCheckHook, pythonOlder, + typer, + yarl, + zeroconf, }: buildPythonPackage rec { pname = "wled"; version = "0.18.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -32,13 +34,13 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" \ + --replace-fail "--cov" "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp awesomeversion backoff @@ -46,6 +48,13 @@ buildPythonPackage rec { yarl ]; + passthru.optional-dependencies = { + cli = [ + typer + zeroconf + ]; + }; + nativeCheckInputs = [ aresponses pytest-asyncio From 97d379347bae733064a4a298d1d8ac3872113fbf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 May 2024 09:41:07 +0200 Subject: [PATCH 191/311] esphome: 2024.4.2 -> 2024.5.2 https://github.com/esphome/esphome/releases/tag/2024.5.0 https://github.com/esphome/esphome/releases/tag/2024.5.1 https://github.com/esphome/esphome/releases/tag/2024.5.2 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 2593ef5b7bb8..dccdd8958f81 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.4.2"; + version = "2024.5.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-q4SVsfd5PJjeqt6UJJG6vuyxTA/bqDDl6e5dxhWIfYM="; + hash = "sha256-LcRqqwMVDgXeUqBS7gmfZqGJxKmXgRfnjNbejlQgijI="; }; nativeBuildInputs = with python.pkgs; [ From cd4d80665f375da3f13aa19f7b2d534e62f5831a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:25:05 +0200 Subject: [PATCH 192/311] python312Packages.pytest-test-utils: 0.0.8 -> 0.1.0 Diff: https://github.com/iterative/pytest-test-utils/compare/refs/tags/0.0.8...0.1.0 --- pkgs/development/python-modules/pytest-test-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index 6c50a815fa28..7d82fc8add97 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytest-test-utils"; - version = "0.0.8"; + version = "0.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; + hash = "sha256-19oNAFff++7ntMdlnMXYc2w5I+EzGwWJh+rB1IjNZGk="; }; nativeBuildInputs = [ From 7fa3c4caff9c0852085528e90c0e9da990c7693c Mon Sep 17 00:00:00 2001 From: cjshearer Date: Mon, 6 May 2024 10:08:51 -0400 Subject: [PATCH 193/311] maintainers: add cjshearer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 96cee3a89273..75ab1517e779 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3762,6 +3762,12 @@ githubId = 136485; name = "Chad Jablonski"; }; + cjshearer = { + email = "cjshearer@live.com"; + github = "cjshearer"; + githubId = 7173077; + name = "Cody Shearer"; + }; ck3d = { email = "ck3d@gmx.de"; github = "ck3d"; From 82e103ece72170609040667130cd186d497ab5ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:27:10 +0200 Subject: [PATCH 194/311] python312Packages.pytest-test-utils: refactor --- .../python-modules/pytest-test-utils/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index 7d82fc8add97..3d2c0ecc3587 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, setuptools-scm, - wheel, pytestCheckHook, pytest, pythonOlder, @@ -13,21 +12,20 @@ buildPythonPackage rec { pname = "pytest-test-utils"; version = "0.1.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "pytest-test-utils"; rev = "refs/tags/${version}"; hash = "sha256-19oNAFff++7ntMdlnMXYc2w5I+EzGwWJh+rB1IjNZGk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; buildInputs = [ pytest ]; @@ -39,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest utilities for tests"; homepage = "https://github.com/iterative/pytest-test-utils"; + changelog = "https://github.com/iterative/pytest-test-utils/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From c8842e422246f861f2d3f41f985479eef2666792 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:36:06 +0200 Subject: [PATCH 195/311] python312Packages.pyrympro: init at 0.0.8 Module to interact with Read Your Meter Pro https://github.com/OnFreund/pyrympro --- .../python-modules/pyrympro/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyrympro/default.nix diff --git a/pkgs/development/python-modules/pyrympro/default.nix b/pkgs/development/python-modules/pyrympro/default.nix new file mode 100644 index 000000000000..70ed0c42a0e6 --- /dev/null +++ b/pkgs/development/python-modules/pyrympro/default.nix @@ -0,0 +1,39 @@ +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "pyrympro"; + version = "0.0.8"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "pyrympro"; + rev = "refs/tags/v${version}"; + hash = "sha256-mRvKLPgtBgmFDTHqra7GslxsgsJpQ2w/DE0Zgz5jujk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "pyrympro" ]; + + meta = with lib; { + description = "Module to interact with Read Your Meter Pro"; + homepage = "https://github.com/OnFreund/pyrympro"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73bf650c68c3..89a655dc2fad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10024,6 +10024,8 @@ self: super: with self; { pyrogram = callPackage ../development/python-modules/pyrogram { }; + pyrympro = callPackage ../development/python-modules/pyrympro { }; + pysabnzbd = callPackage ../development/python-modules/pysabnzbd { }; pysbd = callPackage ../development/python-modules/pysbd { }; From 74ae274897ddfdc516dad0a54f6085b20f42b0de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 01:38:08 +0200 Subject: [PATCH 196/311] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9824cc333314..56a8d62cc20e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -3802,7 +3802,8 @@ zeroconf ]; "rympro" = ps: with ps; [ - ]; # missing inputs: pyrympro + pyrympro + ]; "sabnzbd" = ps: with ps; [ pysabnzbd ]; @@ -5777,6 +5778,7 @@ "ruckus_unleashed" "ruuvi_gateway" "ruuvitag_ble" + "rympro" "sabnzbd" "samsungtv" "sanix" From 8279d13a6282a089f6af7d379bf916cd4d2f1649 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 23 May 2024 01:40:17 +0200 Subject: [PATCH 197/311] CODEOWNERS: add adamcstephens to forgejo --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b91f753015eb..e78e7ab2bdef 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -306,8 +306,8 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag /pkgs/applications/networking/cluster/terraform-providers @zowoq # Forgejo -nixos/modules/services/misc/forgejo.nix @bendlas @emilylange -pkgs/by-name/fo/forgejo/package.nix @bendlas @emilylange +nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange +pkgs/by-name/fo/forgejo/package.nix @adamcstephens @bendlas @emilylange # Dotnet /pkgs/build-support/dotnet @IvarWithoutBones From af9c962bec23df4a884fc93e21d9f706e7fe7520 Mon Sep 17 00:00:00 2001 From: Jono Chang Date: Fri, 17 May 2024 20:07:59 +1000 Subject: [PATCH 198/311] stackql: init at 0.5.643 --- pkgs/by-name/st/stackql/package.nix | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/st/stackql/package.nix diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix new file mode 100644 index 000000000000..69c137e12d05 --- /dev/null +++ b/pkgs/by-name/st/stackql/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + stackql, +}: + +buildGoModule rec { + pname = "stackql"; + version = "0.5.643"; + + src = fetchFromGitHub { + owner = "stackql"; + repo = "stackql"; + rev = "v${version}"; + hash = "sha256-9W6bEI+5Q0Kgbd14sWKde3I6WIVz1ZxsXmR009mOPog="; + }; + + vendorHash = "sha256-xcly4jtdUkx/s+YWYFBVeuI2kQBu2oqbLN9ZKkHppkA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion=${builtins.elemAt (lib.splitVersion version) 0}" + "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion=${builtins.elemAt (lib.splitVersion version) 1}" + "-X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion=${builtins.elemAt (lib.splitVersion version) 2}" + "-X github.com/stackql/stackql/internal/stackql/cmd.BuildDate=2024-05-15T07:51:52Z" # date of commit hash + "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=true" + ]; + + __darwinAllowLocalNetworking = true; + + checkFlags = [ "--tags json1,sqleanal" ]; + + passthru.tests.version = testers.testVersion { + package = stackql; + version = "v${version}"; + }; + + meta = { + homepage = "https://github.com/stackql/stackql"; + description = "Deploy, manage and query cloud resources and interact with APIs using SQL"; + mainProgram = "stackql"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jonochang ]; + }; +} From 27a9dd926467500db964b1af3fa290e6e9985f19 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 22 May 2024 20:53:11 -0300 Subject: [PATCH 199/311] pkgsMusl.nginx: fix build Fixes: > error: #warning usage of non-standard #include is deprecated [-Werror=cpp] --- pkgs/servers/http/nginx/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index e998675b5766..67e84f08448e 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -130,6 +130,9 @@ stdenv.mkDerivation { "-Wno-error=deprecated-declarations" "-Wno-error=gnu-folding-constant" "-Wno-error=unused-but-set-variable" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + # fix sys/cdefs.h is deprecated + "-Wno-error=cpp" ]); configurePlatforms = []; From cdd08e06925ef64a9d4f351a0829d94981e41323 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 May 2024 20:00:51 -0400 Subject: [PATCH 200/311] marge-bot: unbreak by disabling erroring test --- pkgs/by-name/ma/marge-bot/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index b564622271d3..8964ce72264b 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.cfg --replace "--flake8 --pylint --cov=marge" "" + substituteInPlace setup.cfg --replace-fail "--flake8 --pylint --cov=marge" "" ''; nativeBuildInputs = [ @@ -30,12 +30,17 @@ python3.pkgs.buildPythonApplication rec { requests ]; - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pendulum ]; disabledTests = [ # test broken when run under Nix: # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." "test_get_mr_ci_status" ]; + disabledTestPaths = [ + # test errors due to API mismatch in test setup: + # "ImportError: cannot import name 'set_test_now' from 'pendulum.helpers'" + "tests/test_interval.py" + ]; pythonImportsCheck = [ "marge" ]; From 51de558f5634bf7865974a2b4635b1ccb7c5d667 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 5 May 2024 11:55:35 -0400 Subject: [PATCH 201/311] maintainers: add rconybea --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37dfd12c2df6..dc5f5a7f0529 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16859,6 +16859,15 @@ githubId = 52847440; name = "Ryan Burns"; }; + rconybea = { + email = "n1xpkgs@hushmail.com"; + github = "rconybea"; + githubId = 8570969; + name = "Roland Conybeare"; + keys = [{ + fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; + }]; + }; rdnetto = { email = "rdnetto@gmail.com"; github = "rdnetto"; From 1fde38bc6fb558e1cba5a61d56710b25996b6dde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 00:11:28 +0000 Subject: [PATCH 202/311] cargo-ndk: 3.5.5 -> 3.5.6 --- pkgs/development/tools/rust/cargo-ndk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index 1c80788aebbd..b1068127483b 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ndk"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "bbqsrc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2nL+NE4ntZbm2DdPZEoJLDeMAxaPXgrSSIvwAThlLlA="; + sha256 = "sha256-piNKtmDssDeB+DznLl0uufT5BFiVCMmYGuRmBUr5QWQ="; }; - cargoHash = "sha256-Fa1pkHdjngJx7FwfvSQ76D61NPYC88jXqYnjWx6K2f8="; + cargoHash = "sha256-sIKan8LnGv4sGVrGOUOKSD3R4fNRu5yBFATm5MWDTSU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreGraphics From 36074c94629d4a74d9893839f782e3958f63b0fe Mon Sep 17 00:00:00 2001 From: dylan madisetti Date: Wed, 22 May 2024 20:15:39 -0400 Subject: [PATCH 203/311] python311Packages.marimo: 0.6.0 -> 0.6.2 --- pkgs/development/python-modules/marimo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 36317c489c7b..bbe15353e09c 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -17,19 +17,20 @@ tomlkit, uvicorn, websockets, + pyyaml, pytestCheckHook, }: buildPythonPackage rec { pname = "marimo"; - version = "0.6.0"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-L6ICaaMRrMOr/d8CJGcXxOYCWTVh8ObckW7xNeLRB2Q="; + hash = "sha256-sp3lQPLpU5qvHKQ02c/Ga1M8IsbmOX5nz2XPBMbGj30="; }; build-system = [ setuptools ]; @@ -48,6 +49,7 @@ buildPythonPackage rec { tomlkit uvicorn websockets + pyyaml ]; nativeCheckInputs = [ pytestCheckHook ]; From 71ea77b4b011e1912a929baa47a026d8236bb8be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 02:28:24 +0200 Subject: [PATCH 204/311] python312Packages.ecos: 2.0.11 -> 2.0.13 Diff: embotech/ecos-python@refs/tags/v2.0.11...v2.0.13 Changelog: https://github.com/embotech/ecos-python/releases/tag/v2.0.13 --- .../python-modules/ecos/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index defeaeb95cb6..6daec8eb775d 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -2,44 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - nose, - numpy, + oldest-supported-numpy, + pytestCheckHook, pythonOlder, scipy, + setuptools, }: buildPythonPackage rec { pname = "ecos"; - version = "2.0.11"; - format = "setuptools"; + version = "2.0.13"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jflmXR7fuGRSyI6NoQrHFvkKqF/D4iq47StNSCdLbqQ="; + hash = "sha256-3NcZBZ7fnwiMelGssa74b5PgmXmNZhP4etNRpyrCkpo="; fetchSubmodules = true; }; - propagatedBuildInputs = [ - numpy + build-system = [ setuptools ]; + + dependencies = [ + oldest-supported-numpy scipy ]; - nativeCheckInputs = [ nose ]; - - checkPhase = '' - cd ./src - nosetests test_interface.py test_interface_bb.py - ''; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ecos" ]; meta = with lib; { description = "Python interface for ECOS"; homepage = "https://github.com/embotech/ecos-python"; + changelog = "https://github.com/embotech/ecos-python/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ drewrisinger ]; }; From 710b4eab66725c6840d76f1816c72551b55e11fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 02:31:21 +0200 Subject: [PATCH 205/311] python312Packages.psrpcore: marks as broken on darwin --- pkgs/development/python-modules/psrpcore/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 102d9ce9b7c0..72c8da5f5407 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, cryptography, fetchFromGitHub, @@ -42,5 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/jborean93/psrpcore/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } From 6a55deb2d68edeeafebacbed1e554330b82b0f41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 00:32:48 +0000 Subject: [PATCH 206/311] ledger-live-desktop: 2.80.0 -> 2.81.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 462ae649510a..36344bf1a6e1 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.80.0"; + version = "2.81.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-mtvLrA2wQM1om9En16/4AQFeddcRDoEyOwrefo5tOkk="; + hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E="; }; appimageContents = appimageTools.extractType2 { From 514637f340c98def2ce40e01c83bf5dd52627c50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 13:26:58 +0200 Subject: [PATCH 207/311] python311Packages.pins: refactor --- pkgs/development/python-modules/pins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 627bdd0e64e5..90804ad1bd91 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -40,12 +40,12 @@ buildPythonPackage rec { hash = "sha256-rNIjHwFELHoxDxC/T5vPzHA6Ifjz01rJpTK6kjUxOIM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ appdirs fsspec humanize From 73a224709eee6f568cf342cf996e42243b7adc3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 May 2024 15:17:51 +0200 Subject: [PATCH 208/311] python311Packages.pins: 0.8.4 -> 0.8.6 Diff: https://github.com/rstudio/pins-python/compare/refs/tags/v0.8.4...v0.8.6 Changelog: https://github.com/rstudio/pins-python/releases/tag/v0.8.6 --- pkgs/development/python-modules/pins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 90804ad1bd91..30f9c503c34b 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "pins"; - version = "0.8.4"; + version = "0.8.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "rstudio"; repo = "pins-python"; rev = "refs/tags/v${version}"; - hash = "sha256-rNIjHwFELHoxDxC/T5vPzHA6Ifjz01rJpTK6kjUxOIM="; + hash = "sha256-TRwdd0vxqXZgongjooJG5rzTnopUsjfl2I8z3nBocdg="; }; build-system = [ From a6a4ba6887c5cd05d0f9313c996002e0dec73170 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 02:44:39 +0200 Subject: [PATCH 209/311] python312Packages.thrift: disable on Python 3.12 Still uses distutils --- pkgs/development/python-modules/thrift/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 37ea57125052..f33ba9cfa2f6 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -2,20 +2,28 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, + pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "thrift"; version = "0.20.0"; - format = "setuptools"; + pyproject = true; + + # Still uses distutils + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; hash = "sha256-TdZi6t9riuvopBcpUnvWmt9s6qKoaBy+9k0Sc7Po/ro="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; # No tests. Breaks when not disabling. doCheck = false; From 7f731cae793e81ab12a5303d638fcd89a694a90c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 12 May 2024 14:16:42 +0200 Subject: [PATCH 210/311] neovim: 0.9.5 -> 0.10.0 Changelog: https://neovim.io/doc/user/news-0.10.html --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 0dd8ca8a0877..b7b66d8544ff 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: in { pname = "neovim-unwrapped"; - version = "0.9.5"; + version = "0.10.0"; __structuredAttrs = true; @@ -74,7 +74,7 @@ in { owner = "neovim"; repo = "neovim"; rev = "v${finalAttrs.version}"; - hash = "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE="; + hash = "sha256-FCOipXHkAbkuFw9JjEpOIJ8BkyMkjkI0Dp+SzZ4yZlw="; }; patches = [ From d5786c1b5dd2d560724b78f3ce51f1f4ef52d053 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Fri, 17 May 2024 00:30:30 +0200 Subject: [PATCH 211/311] neovim: Update bundled tree-sitter parsers --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 12 ++++-- .../neovim-unwrapped/treesitter-parsers.nix | 42 ++++++++++++------- .../update-treesitter-parsers.py | 8 ++-- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index b7b66d8544ff..eaf637c88e64 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -86,7 +86,11 @@ in { dontFixCmake = true; - inherit lua treesitter-parsers; + inherit lua; + treesitter-parsers = treesitter-parsers // + { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } // + { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } + ; buildInputs = [ gperf @@ -169,11 +173,13 @@ in { '' + '' mkdir -p $out/lib/nvim/parser '' + lib.concatStrings (lib.mapAttrsToList - (language: src: '' + (language: grammar: '' ln -s \ ${tree-sitter.buildGrammar { - inherit language src; + inherit (grammar) src; version = "neovim-${finalAttrs.version}"; + language = grammar.language or language; + location = grammar.location or null; }}/parser \ $out/lib/nvim/parser/${language}.so '') diff --git a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix index d36f8bda8542..e4d4dd60e2eb 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix @@ -1,24 +1,36 @@ { fetchurl }: { - c = fetchurl { - url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz"; - hash = "sha256:af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2"; + c.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-c/archive/v0.21.0.tar.gz"; + hash = "sha256:6f0f5d1b71cf8ffd8a37fb638c6022fa1245bd630150b538547d52128ce0ea7e"; }; - lua = fetchurl { - url = "https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.14.tar.gz"; - hash = "sha256:930d0370dc15b66389869355c8e14305b9ba7aafd36edbfdb468c8023395016d"; + lua.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v0.1.0.tar.gz"; + hash = "sha256:230cfcbfa74ed1f7b8149e9a1f34c2efc4c589a71fe0f5dc8560622f8020d722"; }; - vim = fetchurl { - url = "https://github.com/neovim/tree-sitter-vim/archive/v0.3.0.tar.gz"; - hash = "sha256:403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2"; + vim.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vim/archive/v0.4.0.tar.gz"; + hash = "sha256:9f856f8b4a10ab43348550fa2d3cb2846ae3d8e60f45887200549c051c66f9d5"; }; - vimdoc = fetchurl { - url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.0.0.tar.gz"; - hash = "sha256:1ff8f4afd3a9599dd4c3ce87c155660b078c1229704d1a254433e33794b8f274"; + vimdoc.src = fetchurl { + url = "https://github.com/neovim/tree-sitter-vimdoc/archive/v2.5.1.tar.gz"; + hash = "sha256:063645096504b21603585507c41c6d8718ff3c11b2150c5bfc31e8f3ee9afea3"; }; - query = fetchurl { - url = "https://github.com/nvim-treesitter/tree-sitter-query/archive/v0.1.0.tar.gz"; - hash = "sha256:e2b806f80e8bf1c4f4e5a96248393fe6622fc1fc6189d6896d269658f67f914c"; + query.src = fetchurl { + url = "https://github.com/tree-sitter-grammars/tree-sitter-query/archive/v0.3.0.tar.gz"; + hash = "sha256:f878ff37abcb83250e31a6569e997546f3dbab74dcb26683cb2d613f7568cfc0"; + }; + python.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-python/archive/v0.21.0.tar.gz"; + hash = "sha256:720304a603271fa89e4430a14d6a81a023d6d7d1171b1533e49c0ab44f1e1c13"; + }; + bash.src = fetchurl { + url = "https://github.com/tree-sitter/tree-sitter-bash/archive/v0.21.0.tar.gz"; + hash = "sha256:f0515efda839cfede851adb24ac154227fbc0dfb60c6c11595ecfa9087d43ceb"; + }; + markdown.src = fetchurl { + url = "https://github.com/MDeiml/tree-sitter-markdown/archive/v0.2.3.tar.gz"; + hash = "sha256:4909d6023643f1afc3ab219585d4035b7403f3a17849782ab803c5f73c8a31d5"; }; } diff --git a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py index 27260ca64917..117c7eb48123 100755 --- a/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py +++ b/pkgs/by-name/ne/neovim-unwrapped/update-treesitter-parsers.py @@ -7,7 +7,7 @@ from pathlib import Path parsers = {} dir = Path(__file__).parent -regex = re.compile(r"^set\(TREESITTER_([A-Z_]+)_(URL|SHA256)\s+([^ \)]+)\s*\)\s*$") +regex = re.compile(r"^TREESITTER_([A-Z_]+)_(URL|SHA256)\s+(.+)$") src = subprocess.check_output( [ @@ -20,8 +20,8 @@ src = subprocess.check_output( text=True, ).strip() -for line in open(f"{src}/cmake.deps/CMakeLists.txt"): - m = regex.fullmatch(line) +for line in open(f"{src}/cmake.deps/deps.txt"): + m = regex.fullmatch(line.strip()) if m is None: continue @@ -37,7 +37,7 @@ with open(dir / "treesitter-parsers.nix", "w") as f: f.write("{ fetchurl }:\n\n{\n") for lang, src in parsers.items(): f.write( - f""" {lang} = fetchurl {{ + f""" {lang}.src = fetchurl {{ url = "{src["URL"]}"; hash = "sha256:{src["SHA256"]}"; }}; From 954cc257cf454b08acd3d95deb6fa9f213b90b4e Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Sat, 18 May 2024 02:57:22 -0500 Subject: [PATCH 212/311] neovide: 0.12.2 -> 0.13.0 --- pkgs/by-name/ne/neovide/package.nix | 10 +++++----- pkgs/by-name/ne/neovide/skia-externals.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index ce9b091add82..a4c8791c5aa6 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-M19LKNjUmC0WkVGm4t7vjxgMMe0FdMTmB1mLcG33OUg="; + sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw="; }; - cargoHash = "sha256-2fPprZVT7V+Ot8aCpWj6WTdyFylmzlujFdTJCrtE0rk="; + cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc="; SKIA_SOURCE_DIR = let @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m119-0.67.3"; - sha256 = "sha256-U75NuJnQa5+SNlOrsBmdlvflGdjo3el63EeIsbnE7ms="; + rev = "m124-0.72.3"; + sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/by-name/ne/neovide/skia-externals.json b/pkgs/by-name/ne/neovide/skia-externals.json index e57814e2a2d8..9a71fd62899f 100644 --- a/pkgs/by-name/ne/neovide/skia-externals.json +++ b/pkgs/by-name/ne/neovide/skia-externals.json @@ -16,13 +16,13 @@ }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", - "rev": "c876c8f87101c5a75f6014b0f832499afeb65b73", - "sha256": "sha256-mwozVo8ymyrYN4tw+/ZnSI+xogSTZQ6PUBba/jQqRkE=" + "rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596", + "sha256": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ=" }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "4cfc6d8e173e800df086d7be078da2e8c5cfca19", - "sha256": "sha256-rrstyAz7Eb8ZgFJZKUASY8nU4YFZAptd5VS9B2cs2Yg=" + "rev": "c053e8f29257814e11ad61493dbbe29f27656de4", + "sha256": "sha256-D8DNcZH/oiJqWvfWFHvQ8AwQ3OrMwyZdfGmZ5y30Hvg=" }, "wuffs": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -31,7 +31,7 @@ }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git", - "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", - "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" + "rev": "144b348e072a78e8130ed0acc452c9f039a67bf2", + "sha256": "sha256-eTF7q7hR4S1OqV2oPQKmcHujA5Od4rGMc5879kT0SkE=" } } From 4a2f2c7754ff61bafaa235d6ba78e0a3ecfbf8ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 01:27:23 +0000 Subject: [PATCH 213/311] c2patool: 0.9.0 -> 0.9.1 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index a334b857acc5..470aac119c11 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yR6VepMZquURDb2SDwx+xE55jo3MTzh6ntSrQln1Xxs="; + sha256 = "sha256-+Nnvg1VzVhyrOG1/yIbeKhELzTL5j3cYFb8+P4P0qxA="; }; - cargoHash = "sha256-Z4Q/33CwbJXlMZBq4WRT2k78PvaHpNm4pQkiAehCImI="; + cargoHash = "sha256-guV1n3Gx00ODOyNuosAeRw1NPumjdkC2dFJFuwFBheg="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From 2ae9dea1d92ad6966df0c282e9629a4cefd4001b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 01:36:11 +0000 Subject: [PATCH 214/311] lsp-plugins: 1.2.15 -> 1.2.16 --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 89cd9b6ff329..56b508df7f6f 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.15"; + version = "1.2.16"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-krku+jFGOvLwixNGd+0jBzE/17k/OU0zAePLhnxd864="; + sha256 = "sha256-w2BUIF44z78syLroQk2asVXA5bt9P9POiuwxpnlkc8o="; }; outputs = [ "out" "dev" "doc" ]; From 42d079c690bfe77624aa3151b5619f46d170458d Mon Sep 17 00:00:00 2001 From: Assistant Date: Tue, 21 May 2024 23:04:41 -0400 Subject: [PATCH 215/311] twitch-chat-downloader: 2.5.3 -> 2.5.4 --- .../misc/twitch-chat-downloader/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index c649aa3811c5..922c925cbb0c 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub , iso8601 , progressbar2 , requests @@ -8,15 +8,16 @@ buildPythonApplication rec { pname = "twitch-chat-downloader"; - version = "2.5.3"; + version = "2.5.4"; # NOTE: Using maintained fork because upstream has stopped working, and it has # not been updated in a while. # https://github.com/PetterKraabol/Twitch-Chat-Downloader/issues/142 - src = fetchPypi { - inherit version; - pname = "tdh-tcd"; - sha256 = "sha256-dvj0HoF/2n5aQGMOD8UYY4EZegQwThPy1XJFvXyRT4Q="; + src = fetchFromGitHub { + owner = "TheDrHax"; + repo = "twitch-chat-downloader"; + rev = version; + hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; }; propagatedBuildInputs = [ From 02d17ed973a443359ab9898b26a50d8766735909 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 10:01:37 +0000 Subject: [PATCH 216/311] buildbot: 3.11.2 -> 3.11.3 --- .../buildbot/master.nix | 4 ++-- .../continuous-integration/buildbot/pkg.nix | 2 +- .../buildbot/plugins.nix | 22 +++++++++---------- .../buildbot/worker.nix | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 7bf5eeab82ec..2a2911cf131f 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -72,14 +72,14 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.2"; + version = "3.11.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x7RaApfIe1x7Py1KLQCcotxU6dJRXTOk67W+QOhNJf0="; + hash = "sha256-qcICSsjcgOrLG8zHBx0eSVSiXDAeHPH4roRZI9TZTkk="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index d121ec68cbde..a93cbf28e3b8 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-ZgDHPC2j3vV3m7wBZhUUh/Th/oGKq+8RxnfQ71Cr6oY="; + hash = "sha256-pO2TmTwbY0cnR+882pl7wDiR6JEK+sHHpAltKmTxiIM="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index ade8f2e243d4..7403498a8c61 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-xOsz71kprzKKqvvwpsZTACWf4z+Svx9BQ72xGEZXKdw="; + hash = "sha256-EL5iZ257VXnL+29Jr6r3PVeURX1AcugfZ4RLTjClsXo="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-wUiMEAFmqjHXPjnPhsaLWqxvOXyEQIeRBL4W3LB3vkw="; + hash = "sha256-5QLw5nXnU+z11E5Tgvu9bbbpCTRpV2zXndukcZPRjtE="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-KerHS5F4b30TvlGeSf6QLUt49S6Iki7O5nex6KPypJY="; + hash = "sha256-tzqifo9A/KJF9dLpO7jblVaDjx7++v0wLz1Olc79JxI="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-XrywoVM2ErJ4i7WrRKPRaCOwt5JVDJT6xP7L/Dfv+gk="; + hash = "sha256-fzaqYmaO+vWnQpUvOsPCny3W27atcIHsgeGV6dKEJeg="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-mhVbuOhe0BrXHbn8bd41Q7I8Xak7fO8ahIK0r113vGY="; + hash = "sha256-BLIs91k8/A4LYMTDgct7TOWFoLU4qK47Javr8qRzkZQ="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-X89XrjdD0GL7MabLWtkQcdCa4Ain1AGre6mXF/inmck="; + hash = "sha256-dX+tp+WidfLy612+41jz+do/iXQTaIQPcetG8td3jp4="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-YH5SfYuW07Pp00LoBvcDB8MiHB1HzYWg5kQVICrkS5s="; + hash = "sha256-2kLGdvmf2mnF21gkDCf6h+bhnsxveaNNh95qczRY824="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-rmyAsFCTeIYPdrlWDCxlbjw+BCKwcIaTHlK8KJP0T88="; + hash = "sha256-rIAbk9+6Wi1PCjizHp9p6jpCwaBgBT5Ch1Sa4VKDoww="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-Ls3NJka5vVTx1GW9bnr3jlulj7/pNkX9omXrTIWrwtU="; + hash = "sha256-D9mjEKFrh+ytNbpuN/06XbiBnKjFLopXfjDg28j7niw="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-t3LLZJ+kPcowqSyeRcuH3kEjBEiju1MI0z1qhU6KPBs="; + hash = "sha256-q3In0IMAIBUjxSzv4LlH9EJukLYJ3WzoEYkFBZB96W8="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-//MftUqUWE2+RpxRPzDEH7tOCN2D1HD8dETZw1OQe5s="; + hash = "sha256-TK4KYn3CWxymTsKWeqHr2i5rdO9ZDHvJrb9RqfKNJV4="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 80e255153b77..071559eccf6c 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-7DAo1Yy20FeWXawV4wHzXDGtgyIGDJQuD2joJma96rM="; + hash = "sha256-TFymBnUufOEWZ/IUKd7nebZ+yl58ZChFkGrUxOXn28g="; }; postPatch = '' From e8553da1b1014f8e1525fb2cb7ff1ba129dce17d Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 11:50:39 +0800 Subject: [PATCH 217/311] python312Packages.ds4drv: fix build --- pkgs/development/python-modules/ds4drv/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index 0eca163928fa..d4ebc468f9ef 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -5,12 +5,15 @@ evdev, pyudev, bluez, + setuptools, }: buildPythonPackage rec { pname = "ds4drv"; version = "0.5.1"; - format = "setuptools"; + + pyproject = true; + build-system = [ setuptools ]; # PyPi only carries py3 wheel src = fetchFromGitHub { @@ -20,7 +23,12 @@ buildPythonPackage rec { sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v"; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace ds4drv/config.py \ + --replace-fail SafeConfigParser ConfigParser + ''; + + dependencies = [ evdev pyudev ]; From 94490fd53141d1be123d2ca0dfe1fdac0487a2da Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 22 May 2024 13:36:17 +0200 Subject: [PATCH 218/311] castxml: fix build on darwin --- pkgs/by-name/ca/castxml/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/castxml/package.nix b/pkgs/by-name/ca/castxml/package.nix index 2b0a255bbdc8..684d868be686 100644 --- a/pkgs/by-name/ca/castxml/package.nix +++ b/pkgs/by-name/ca/castxml/package.nix @@ -37,13 +37,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libclang libffi libxml2 zlib - ]; - - propagatedBuildInputs = [ + ] ++ lib.optionals (!stdenv.isDarwin) [ libclang ]; @@ -51,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "path" "CLANG_RESOURCE_DIR" "${lib.getDev libclang}") (lib.cmakeBool "SPHINX_HTML" withHTML) (lib.cmakeBool "SPHINX_MAN" withManual) + ] ++ lib.optionals stdenv.isDarwin [ + (lib.cmakeOptionType "path" "Clang_DIR" "${lib.getDev libclang}/lib/cmake/clang") ]; # 97% tests passed, 97 tests failed out of 2881 From 1e4ff676da0f936e057d86153deeeb0c54b8d009 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 13:34:31 +0800 Subject: [PATCH 219/311] nezha-agent: 0.16.8 -> 0.16.9 changelog: https://github.com/nezhahq/agent/releases/tag/v0.16.9 --- pkgs/by-name/ne/nezha-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 2f80dc2ded43..d470290b8cae 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.8"; + version = "0.16.9"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-s3l6sI+gQcy5Qxjzg+l9t9e8WWYppiMljX7o1rSXFIs="; + hash = "sha256-WK9aTKRSpBrqEKje168Gmn6ROLFxE/fuYp10Ywtr4ks="; }; - vendorHash = "sha256-Qx0XAlWLDqN1CZTmf1yVc8yFmz9/5bz/HVqN/korJzE="; + vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII="; ldflags = [ "-s" From 4a3b0128511e0725423c6370324d1eb039b4fac9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 07:55:41 +0200 Subject: [PATCH 220/311] ruff: 0.4.4 -> 0.4.5 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.4.5 --- pkgs/development/tools/ruff/Cargo.lock | 3698 +++++++++++++++++++++++ pkgs/development/tools/ruff/default.nix | 17 +- 2 files changed, 3709 insertions(+), 6 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..6efb7b99e761 --- /dev/null +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -0,0 +1,3698 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" + +[[package]] +name = "argfile" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c5c8e418080ef8aa932039d12eda7b6f5043baf48f1523c166fbc32d004534" +dependencies = [ + "fs-err", + "os_str_bytes", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bstr" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +dependencies = [ + "memchr", + "regex-automata 0.4.6", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "cachedir" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703f3937077db8fa35bee3c8789343c1aec2585f0146f09d658d4ccc0e8d873" +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.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[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.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.5", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_complete_command" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" +dependencies = [ + "clap", + "clap_complete", + "clap_complete_fig", + "clap_complete_nushell", +] + +[[package]] +name = "clap_complete_fig" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_complete_nushell" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "clearscreen" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f8c93eb5f77c9050c7750e14f13ef1033a40a0aac70c6371535b6763a01438c" +dependencies = [ + "nix", + "terminfo", + "thiserror", + "which", + "winapi", +] + +[[package]] +name = "codspeed" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a104ac948e0188b921eb3fcbdd55dcf62e542df4c7ab7e660623f6288302089" +dependencies = [ + "colored", + "libc", + "serde_json", +] + +[[package]] +name = "codspeed-criterion-compat" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "722c36bdc62d9436d027256ce2627af81ac7a596dfc7d13d849d0d212448d7fe" +dependencies = [ + "codspeed", + "colored", + "criterion", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.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 = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +dependencies = [ + "log", + "web-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "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 0.10.5", +] + +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "ctrlc" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +dependencies = [ + "nix", + "windows-sys 0.52.0", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[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" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + +[[package]] +name = "either" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +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.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.6", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "imara-diff" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" +dependencies = [ + "ahash", + "hashbrown 0.12.3", +] + +[[package]] +name = "imperative" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" +dependencies = [ + "phf", + "rust-stemmers", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", + "vt100", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "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.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +dependencies = [ + "console", + "globset", + "lazy_static", + "linked-hash-map", + "regex", + "serde", + "similar", + "walkdir", +] + +[[package]] +name = "insta-cmd" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffeeefa927925cced49ccb01bf3e57c9d4cd132df21e576eb9415baeab2d3de6" +dependencies = [ + "insta", + "serde", + "serde_json", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jod-thread" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[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.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" + +[[package]] +name = "libcst" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f1e25d1b119ab5c2f15a6e081bb94a8d547c5c2ad065f5fd0dbb683f31ced91" +dependencies = [ + "chic", + "libcst_derive", + "memchr", + "paste", + "peg", + "regex", + "thiserror", +] + +[[package]] +name = "libcst_derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5011f2d59093de14a4a90e01b9d85dee9276e58a25f0107dcee167dd601be0" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[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.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lsp-server" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.95.1" +source = "git+https://github.com/astral-sh/lsp-types.git?rev=3512a9f#3512a9f33eadc5402cfab1b8f7340824c8ca1439" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matchit" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "540f1c43aed89909c0cc0cc604e3bb2f7e7a341a3728a9e6cfe760e733cd11ed" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "mimalloc" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d" +dependencies = [ + "libmimalloc-sys", +] + +[[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.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "natord" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" + +[[package]] +name = "newtype-uuid" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526cb7c660872e401beaf3297f95f548ce3b4b4bdd8121b7c0713771d7c4a6e" +dependencies = [ + "uuid", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.5.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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 = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +dependencies = [ + "memchr", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] + +[[package]] +name = "path-slash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "peg" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" + +[[package]] +name = "pep440_rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0c29f9c43de378b4e4e0cd7dbcce0e5cfb80443de8c05620368b2948bc936a1" +dependencies = [ + "once_cell", + "regex", + "serde", + "unicode-width", +] + +[[package]] +name = "pep440_rs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0a570e7ec9171250cac57614e901f62408094b54b3798bb920d3cf0d4a0e09" +dependencies = [ + "once_cell", + "serde", + "unicode-width", + "unscanny", +] + +[[package]] +name = "pep508_rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "910c513bea0f4f833122321c0f20e8c704e01de98692f6989c2ec21f43d88b1e" +dependencies = [ + "once_cell", + "pep440_rs 0.4.0", + "regex", + "serde", + "thiserror", + "tracing", + "unicode-width", + "url", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pmutil" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "proc-macro2" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyproject-toml" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95c3dd745f99aa3c554b7bb00859f7d18c2f1d6afd749ccc86d60b61e702abd9" +dependencies = [ + "indexmap", + "pep440_rs 0.4.0", + "pep508_rs", + "serde", + "toml", +] + +[[package]] +name = "quick-junit" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc1a6a5406a114913df2df8507998c755311b55b78584bed5f6e88f6417c4d4" +dependencies = [ + "chrono", + "indexmap", + "newtype-uuid", + "quick-xml", + "strip-ansi-escapes", + "thiserror", + "uuid", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "red_knot" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags 2.5.0", + "crossbeam", + "ctrlc", + "dashmap", + "hashbrown 0.14.5", + "indexmap", + "notify", + "parking_lot", + "rayon", + "ruff_index", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_parser", + "ruff_text_size", + "rustc-hash", + "smol_str", + "tempfile", + "textwrap", + "tracing", + "tracing-subscriber", + "tracing-tree", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "result-like" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf7172fef6a7d056b5c26bf6c826570267562d51697f4982ff3ba4aec68a9df" +dependencies = [ + "result-like-derive", +] + +[[package]] +name = "result-like-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d6574c02e894d66370cfc681e5d68fedbc9a548fb55b30a96b3f0ae22d0fe5" +dependencies = [ + "pmutil", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ruff" +version = "0.4.5" +dependencies = [ + "anyhow", + "argfile", + "bincode", + "bitflags 2.5.0", + "cachedir", + "chrono", + "clap", + "clap_complete_command", + "clearscreen", + "colored", + "filetime", + "ignore", + "insta", + "insta-cmd", + "is-macro", + "itertools 0.12.1", + "log", + "mimalloc", + "notify", + "path-absolutize", + "rayon", + "regex", + "ruff_cache", + "ruff_diagnostics", + "ruff_linter", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_server", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "rustc-hash", + "serde", + "serde_json", + "shellexpand", + "strum", + "tempfile", + "test-case", + "thiserror", + "tikv-jemallocator", + "toml", + "tracing", + "tracing-subscriber", + "tracing-tree", + "walkdir", + "wild", +] + +[[package]] +name = "ruff_benchmark" +version = "0.0.0" +dependencies = [ + "codspeed-criterion-compat", + "criterion", + "mimalloc", + "once_cell", + "ruff_linter", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "serde", + "serde_json", + "tikv-jemallocator", + "ureq", + "url", +] + +[[package]] +name = "ruff_cache" +version = "0.0.0" +dependencies = [ + "filetime", + "glob", + "globset", + "itertools 0.12.1", + "regex", + "ruff_macros", + "seahash", +] + +[[package]] +name = "ruff_dev" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "ignore", + "imara-diff", + "indicatif", + "indoc", + "itertools 0.12.1", + "libcst", + "pretty_assertions", + "rayon", + "regex", + "ruff", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_parser", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_workspace", + "schemars", + "serde", + "serde_json", + "similar", + "strum", + "tempfile", + "toml", + "tracing", + "tracing-indicatif", + "tracing-subscriber", +] + +[[package]] +name = "ruff_diagnostics" +version = "0.0.0" +dependencies = [ + "anyhow", + "is-macro", + "log", + "ruff_text_size", + "serde", +] + +[[package]] +name = "ruff_formatter" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "ruff_cache", + "ruff_macros", + "ruff_text_size", + "rustc-hash", + "schemars", + "serde", + "static_assertions", + "tracing", + "unicode-width", +] + +[[package]] +name = "ruff_index" +version = "0.0.0" +dependencies = [ + "ruff_macros", + "static_assertions", +] + +[[package]] +name = "ruff_linter" +version = "0.4.5" +dependencies = [ + "aho-corasick", + "annotate-snippets 0.9.2", + "anyhow", + "bitflags 2.5.0", + "chrono", + "clap", + "colored", + "fern", + "glob", + "globset", + "imperative", + "insta", + "is-macro", + "is-wsl", + "itertools 0.12.1", + "libcst", + "log", + "memchr", + "natord", + "once_cell", + "path-absolutize", + "pathdiff", + "pep440_rs 0.6.0", + "pyproject-toml", + "quick-junit", + "regex", + "result-like", + "ruff_cache", + "ruff_diagnostics", + "ruff_macros", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_index", + "ruff_python_literal", + "ruff_python_parser", + "ruff_python_semantic", + "ruff_python_stdlib", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "similar", + "smallvec", + "strum", + "strum_macros", + "test-case", + "thiserror", + "toml", + "typed-arena", + "unicode-width", + "unicode_names2", + "url", +] + +[[package]] +name = "ruff_macros" +version = "0.0.0" +dependencies = [ + "itertools 0.12.1", + "proc-macro2", + "quote", + "ruff_python_trivia", + "syn", +] + +[[package]] +name = "ruff_notebook" +version = "0.0.0" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "once_cell", + "rand", + "ruff_diagnostics", + "ruff_source_file", + "ruff_text_size", + "serde", + "serde_json", + "serde_with", + "test-case", + "thiserror", + "uuid", +] + +[[package]] +name = "ruff_python_ast" +version = "0.0.0" +dependencies = [ + "aho-corasick", + "bitflags 2.5.0", + "is-macro", + "itertools 0.12.1", + "once_cell", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "serde", +] + +[[package]] +name = "ruff_python_ast_integration_tests" +version = "0.0.0" +dependencies = [ + "insta", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_codegen" +version = "0.0.0" +dependencies = [ + "once_cell", + "ruff_python_ast", + "ruff_python_literal", + "ruff_python_parser", + "ruff_source_file", +] + +[[package]] +name = "ruff_python_formatter" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap", + "countme", + "insta", + "itertools 0.12.1", + "memchr", + "once_cell", + "regex", + "ruff_cache", + "ruff_formatter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_index", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "similar", + "smallvec", + "static_assertions", + "thiserror", + "tracing", + "unicode-width", +] + +[[package]] +name = "ruff_python_index" +version = "0.0.0" +dependencies = [ + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_python_literal" +version = "0.0.0" +dependencies = [ + "bitflags 2.5.0", + "hexf-parse", + "itertools 0.12.1", + "lexical-parse-float", + "ruff_python_ast", + "unic-ucd-category", +] + +[[package]] +name = "ruff_python_parser" +version = "0.0.0" +dependencies = [ + "annotate-snippets 0.9.2", + "anyhow", + "bitflags 2.5.0", + "bstr", + "insta", + "is-macro", + "itertools 0.12.1", + "memchr", + "ruff_python_ast", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", + "static_assertions", + "unicode-ident", + "unicode-normalization", + "unicode_names2", + "walkdir", +] + +[[package]] +name = "ruff_python_resolver" +version = "0.0.0" +dependencies = [ + "env_logger", + "insta", + "log", + "tempfile", +] + +[[package]] +name = "ruff_python_semantic" +version = "0.0.0" +dependencies = [ + "bitflags 2.5.0", + "is-macro", + "ruff_index", + "ruff_python_ast", + "ruff_python_parser", + "ruff_python_stdlib", + "ruff_source_file", + "ruff_text_size", + "rustc-hash", +] + +[[package]] +name = "ruff_python_stdlib" +version = "0.0.0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ruff_python_trivia" +version = "0.0.0" +dependencies = [ + "itertools 0.12.1", + "ruff_source_file", + "ruff_text_size", + "unicode-ident", +] + +[[package]] +name = "ruff_python_trivia_integration_tests" +version = "0.0.0" +dependencies = [ + "insta", + "ruff_python_index", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", +] + +[[package]] +name = "ruff_server" +version = "0.2.2" +dependencies = [ + "anyhow", + "crossbeam", + "insta", + "jod-thread", + "libc", + "lsp-server", + "lsp-types", + "regex", + "ruff_diagnostics", + "ruff_formatter", + "ruff_linter", + "ruff_notebook", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "rustc-hash", + "serde", + "serde_json", + "shellexpand", + "tracing", + "walkdir", +] + +[[package]] +name = "ruff_source_file" +version = "0.0.0" +dependencies = [ + "memchr", + "once_cell", + "ruff_text_size", + "serde", +] + +[[package]] +name = "ruff_text_size" +version = "0.0.0" +dependencies = [ + "schemars", + "serde", + "serde_test", + "static_assertions", +] + +[[package]] +name = "ruff_wasm" +version = "0.0.0" +dependencies = [ + "console_error_panic_hook", + "console_log", + "js-sys", + "log", + "ruff_formatter", + "ruff_linter", + "ruff_python_ast", + "ruff_python_codegen", + "ruff_python_formatter", + "ruff_python_index", + "ruff_python_parser", + "ruff_python_trivia", + "ruff_source_file", + "ruff_text_size", + "ruff_workspace", + "serde", + "serde-wasm-bindgen", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "ruff_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "colored", + "dirs 5.0.1", + "glob", + "globset", + "ignore", + "is-macro", + "itertools 0.12.1", + "log", + "matchit", + "path-absolutize", + "path-slash", + "pep440_rs 0.6.0", + "regex", + "ruff_cache", + "ruff_formatter", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "ruff_python_formatter", + "ruff_source_file", + "rustc-hash", + "schemars", + "serde", + "shellexpand", + "strum", + "tempfile", + "toml", +] + +[[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.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +dependencies = [ + "dyn-clone", + "schemars_derive", + "serde", + "serde_json", +] + +[[package]] +name = "schemars_derive" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "serde" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-wasm-bindgen" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde_derive" +version = "1.0.201" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_derive_internals" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_with" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +dependencies = [ + "serde", + "serde_derive", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] +name = "smol_str" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +dependencies = [ + "serde", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "2.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "terminfo" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +dependencies = [ + "dirs 4.0.0", + "fnv", + "nom", + "phf", + "phf_codegen", +] + +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "test-case-core", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[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 = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-indicatif" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d" +dependencies = [ + "indicatif", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tree" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" +dependencies = [ + "nu-ansi-term 0.49.0", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[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-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-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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode_names2" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677" +dependencies = [ + "phf", + "unicode_names2_generator", +] + +[[package]] +name = "unicode_names2_generator" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0" +dependencies = [ + "getopts", + "log", + "phf_codegen", + "rand", +] + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "rand", + "uuid-macro-internal", + "wasm-bindgen", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vt100" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +dependencies = [ + "itoa", + "log", + "unicode-width", + "vte", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[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.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +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.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "which" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +dependencies = [ + "either", + "home", + "rustix", + "winsafe", +] + +[[package]] +name = "wild" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" +dependencies = [ + "glob", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[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-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +dependencies = [ + "memchr", +] + +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index cc5caf9951cd..4e540a1ddc8c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,16 +10,21 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-ViXKGcuDla428mI2Am67gtOxfia5VfR+ry2qyczXO/I="; + hash = "sha256-+8JKzKKWPQEanU2mh8p5sRjnoU6DawTQQi43qRXVXIg="; }; - cargoHash = "sha256-VVdIWUQaquVX/8szJ30qPGtG6rFfRadeIvDONd8swro="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; + }; + }; nativeBuildInputs = [ installShellFiles @@ -47,12 +52,12 @@ rustPlatform.buildRustPackage rec { inherit ruff-lsp; }; - meta = with lib; { + meta = { description = "An extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; changelog = "https://github.com/astral-sh/ruff/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "ruff"; - maintainers = with maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } From 724e4680a8c3c2fb6ecc0fd7a8682fbd9e59a9ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:04:35 +0000 Subject: [PATCH 221/311] tmux-mem-cpu-load: 3.8.0 -> 3.8.1 --- pkgs/tools/misc/tmux-mem-cpu-load/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix index 1e197ef162ea..012a18911d40 100644 --- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix +++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tmux-mem-cpu-load"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "thewtex"; repo = "tmux-mem-cpu-load"; rev = "v${version}"; - sha256 = "sha256-dRHV2XF3NFzd4HT9SbRnEn8U40QTnAUJDsM51NA9fEk="; + sha256 = "sha256-8QUcEbgk3DSsWt9TRHHtDhQ7a1hkK8RZEX+0d3h/c0w="; }; nativeBuildInputs = [ cmake ]; From a7094f7697b1fcf7b345fa027fc1d2ae98da9368 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:07:37 +0000 Subject: [PATCH 222/311] swego: 1.0 -> 1.1 --- pkgs/servers/swego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index eb4bcccbbf9d..4e42ea33f97b 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-OlaNDXKaIim5n0niqYIpRliVo7lse76vNxPKF6B6yF0="; + sha256 = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; }; - vendorHash = "sha256-N4HDngQFNCzQ74W52R0khetN6+J7npvBC/bYZBAgLB4="; + vendorHash = "sha256-mJWJdwbZq042//hM3WWp2rnLC1GebckUnsIopbF858Q="; postInstall = '' mv $out/bin/src $out/bin/$pname From 3ee89bd08e219a5b950322c5366dd2f2e5044d7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:23:40 +0000 Subject: [PATCH 223/311] atmos: 1.72.0 -> 1.73.0 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 2163adf6d5b2..9e5dc34dcef3 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.72.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk="; + sha256 = "sha256-rJGhDFVvlVtQboqts8+c6JYTRHC0IwrOm5BYVA20yrY="; }; - vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s="; + vendorHash = "sha256-11r4ph0i05lHXKNy8iMNKqCVzeQbPtHwNPiQU7759rQ="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; From 2de3b0044aa34973abb88356788ce0f22d09f962 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:27:53 +0000 Subject: [PATCH 224/311] cargo-component: 0.12.0 -> 0.13.0 --- pkgs/development/tools/rust/cargo-component/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index eb216bbab11d..12e88a77b4bd 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-SYmKxcU2CxvIFLWoNWBjhJBxIfhZqO2LTyv8WUbuyAY="; + hash = "sha256-e1oticOXOimLXwymRbZ/eQEiqmvqWKgvPuBkdYarkxI="; }; - cargoHash = "sha256-ZbvZBdJ14fQxdVYvPQjCkT5o0Ip9AJyhATGLRAwFfp4="; + cargoHash = "sha256-pn4johqO1K9FKtitH2wNDtf1QUcGlJMvC0WTwG9myD0="; nativeBuildInputs = [ pkg-config From 3ec93b0dbdb3eaf31545d94580516e2ff81029b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:33:39 +0000 Subject: [PATCH 225/311] files-cli: 2.13.49 -> 2.13.50 --- pkgs/by-name/fi/files-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 853d30f3e4a5..1bc90b5420cf 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.49"; + version = "2.13.50"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-QQ2UzWGodQASHJVfnTIp/BUNkAPAV0q8UpTk7qBYgc0="; + hash = "sha256-UeRB+vmnLr85oGwaiuyfe5pVCN1EmEQqyoU5tY2hst8="; }; vendorHash = "sha256-L6UnKbqS6aO8+XSPt5KaKGYr30y9RE+l4U3hapPHHvA="; From 3c985ee7da83e6e15fecafb2ebd3630bdca3107d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:37:31 +0000 Subject: [PATCH 226/311] myks: 4.1.1 -> 4.1.2 --- pkgs/by-name/my/myks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 0205401138f9..630a473fdc5b 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "myks"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-IJlSryyNQFubjBQJ59Gl5Wn3eniwZ0svbGAxLKIrCt4="; + hash = "sha256-ZRbirNhTEGqr6OCE0K873NJ5vI2Phe5z9XJGZUALISo="; }; vendorHash = "sha256-u9dNmgFMn6OMkKgTwNSqizUHJwvRk+S1xKZDozWjbps="; From d28cf9c00b552a9630649c6032a4018dc4c45ff6 Mon Sep 17 00:00:00 2001 From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com> Date: Thu, 23 May 2024 09:49:25 +0300 Subject: [PATCH 227/311] neovim-unwrapped: fix markdown_inline tree-sitter parser Closes #312763. --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index eaf637c88e64..4f714e5463b0 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -89,7 +89,7 @@ in { inherit lua; treesitter-parsers = treesitter-parsers // { markdown = treesitter-parsers.markdown // { location = "tree-sitter-markdown"; }; } // - { markdown-inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } + { markdown_inline = treesitter-parsers.markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } ; buildInputs = [ From 50857283418492f3ecbd43ab5034dedf79c7409a Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 May 2024 10:03:46 +0300 Subject: [PATCH 228/311] calamares-nixos-extensions: 0.3.15 -> 0.3.16 Diff: https://github.com/NixOS/calamares-nixos-extensions/compare/0.3.15...0.3.16 --- pkgs/tools/misc/calamares-nixos-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 2b8965544ab3..481ed56f3de5 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - hash = "sha256-PZQjrteLWcInXIavuANHfzfl9gOXATWtIlDUp45j5Ao="; + hash = "sha256-ajQWmZVY60Q2cGJcLqMT2ypIi7bMMiyHMgdlp3g9874="; }; installPhase = '' From bf8a1a8c4e02a4fd73eacb7e8732deba1ac6a6f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:10:16 +0200 Subject: [PATCH 229/311] python312Packages.pydeconz: refactor --- .../python-modules/pydeconz/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 76fbae16299b..68e31e000270 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "116"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "Kane610"; @@ -28,17 +27,16 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pydeconz --cov-report term-missing" "" \ - --replace "setuptools==" "setuptools>=" \ - --replace "wheel==" "wheel>=" + --replace-fail "--cov=pydeconz --cov-report term-missing" "" \ + --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "wheel==" "wheel>=" ''; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp orjson ]; @@ -53,10 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library wrapping the Deconz REST API"; - mainProgram = "pydeconz"; homepage = "https://github.com/Kane610/deconz"; changelog = "https://github.com/Kane610/deconz/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pydeconz"; }; } From 8b39f81674027d59cc26511c602bb6dc68c5ab53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 06:20:57 +0000 Subject: [PATCH 230/311] terraform: 1.8.3 -> 1.8.4 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6abdcb2bb30e..d2a33c129310 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,9 +166,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.8.3"; - hash = "sha256-4W1Cs3PAGn43eGDK15qSvN+gLdkkoFIwhejcJsCqcYA="; - vendorHash = "sha256-2+ctm1lJjCHITWV7BqoqgBlXKjNT4lueAt4F3UtoL9Q="; + version = "1.8.4"; + hash = "sha256-YCFmjQ/xlyB0spumw8hBUmr9UVC7ZPNGrxYecFKi3aw="; + vendorHash = "sha256-PXA2AWq1IFmnqhhU92S9UaIYTUAAn5lsg3S7h5hBOQE="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From e1ba82b92b347939d25168867d9ed5021cc348f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:35:33 +0200 Subject: [PATCH 231/311] python312Packages.bluetooth-sensor-state-data: 1.6.2 -> 1.7.0 Diff: https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/compare/v1.6.2...v1.7.0 --- .../python-modules/bluetooth-sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index c242f7d8d5cc..d0820d57fff7 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-NC0l3wbQKz4MVM0kHbXBAUol74ir7V/JQgeYCVuyRs4="; + hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; }; nativeBuildInputs = [ poetry-core ]; From 980e77541f9d6b7468bfab23d4b811ea85841110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:37:26 +0200 Subject: [PATCH 232/311] python312Packages.bluetooth-sensor-state-data: refactor --- .../bluetooth-sensor-state-data/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index d0820d57fff7..d3e3a36ff885 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -12,37 +12,38 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; version = "1.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; - rev = "v${version}"; + repo = "bluetooth-sensor-state-data"; + rev = "refs/tags/v${version}"; hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" + ''; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ home-assistant-bluetooth sensor-state-data ]; nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "bluetooth_sensor_state_data" ]; meta = with lib; { description = "Models for storing and converting Bluetooth Sensor State Data"; homepage = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-sensor-state-data/releases/tag/v${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From e5bb012796cd740bef1850d848ad4ab1026093b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 07:48:58 +0000 Subject: [PATCH 233/311] namespace-cli: 0.0.371 -> 0.0.372 --- pkgs/by-name/na/namespace-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 30812bd5ad16..c3e2c2f53065 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.371"; + version = "0.0.372"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-5cP5Z2VDxpBneDX+jhciaNrtDGi8XDm7DhhRBKh6ACU="; + hash = "sha256-rAu/kVaIBc50yDlsCIjcyy4pD6MYuagoF2fEte/+iQw="; }; vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw="; From 1ee4219782a5d7108461c6e318473212cac63ab3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:50:59 +0200 Subject: [PATCH 234/311] checkov: 3.2.92 -> 3.2.106 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.106 --- pkgs/development/tools/analysis/checkov/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 9cf0dc6653b4..911e51ed6ca9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.92"; + version = "3.2.106"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-v1StSo9j0Psr3om3qbcE+Ha9Wz7t6EfGzbyAe34M2qY="; + hash = "sha256-N62tdVnrgOLHi4k/OpKrAfJ7sBu5Xf8lUAmEqatEAGo="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" "rustworkx" "termcolor" + "urllib3" ]; pythonRemoveDeps = [ From 1349027dbc4f7fe5752b7c5172b0df77c92aa672 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 09:55:19 +0200 Subject: [PATCH 235/311] python312Packages.aioquic: 0.9.25 -> 1.0.0 --- .../python-modules/aioquic/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 4b909ecb4aca..f3191a7f8ddf 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -4,7 +4,6 @@ certifi, cryptography, fetchPypi, - fetchpatch, openssl, pylsqpack, pyopenssl, @@ -16,26 +15,19 @@ buildPythonPackage rec { pname = "aioquic"; - version = "0.9.25"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; + hash = "sha256-7THCta+pjFtsr6TzYUnerx3/bFppcB6t0nFnQV+fFmA="; }; - patches = [ - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/e899593805e0b31325a1d347504eb8e6100fe87d.diff"; - hash = "sha256-TTpIIWX/R4k2KxhsN17O9cRW/dN0AARYnju8JTht3D8="; - }) - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ certifi cryptography pylsqpack From ea1a3f4b3ac7253558354a8c6e5601a74009bdf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:20:49 +0200 Subject: [PATCH 236/311] python312Packages.boto3-stubs: 1.34.110 -> 1.34.111 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 6a6dc2ee0ef5..185c8f6a80c8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.110"; + version = "1.34.111"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-S1Xvok7jS1T/5QaJnwvfqMqEMfbUuSItY0fdkOabpzU="; + hash = "sha256-6uJopdcNK4gLgHoVOWAvLInUCQ3m3bAuP+wURmC8H9E="; }; build-system = [ setuptools ]; From 254dbdcc6296ba83381e218bf755b939c91a7f8e Mon Sep 17 00:00:00 2001 From: Greaka Date: Fri, 23 Feb 2024 20:03:51 +0100 Subject: [PATCH 237/311] grafanaPlugins.grafana-oncall-app: init at 1.5.1 --- .../grafana/plugins/grafana-oncall-app/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix new file mode 100644 index 000000000000..6f475f49cfa7 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin { + pname = "grafana-oncall-app"; + version = "1.5.1"; + zipHash = "sha256-3mC4TJ9ACM9e3e6UKI5vaDwXuW6RjbsOQFJU5v0wjk8="; + meta = with lib; { + description = "Developer-friendly incident response for Grafana"; + license = licenses.agpl3Only; + maintainers = lib.teams.fslabs.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 8bbd738f7ab9..bd1e775243f7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -8,6 +8,7 @@ grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; + grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; From 5d515c373e8dd2db5e3087a3cf56d961fb8f1d87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 May 2024 10:31:30 +0200 Subject: [PATCH 238/311] nixos/kea: make ctrl-agent want network-online.target If it wants to run after it, it needs to want it for it to be there. --- nixos/modules/services/networking/kea.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 66173c145d16..11add600b66f 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -278,6 +278,9 @@ in "https://kea.readthedocs.io/en/kea-${package.version}/arm/agent.html" ]; + wants = [ + "network-online.target" + ]; after = [ "network-online.target" "time-sync.target" From ed907ddac82fceb5701ee82eb36835de44dddfa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:32:11 +0200 Subject: [PATCH 239/311] dyndnsc: refactor --- .../networking/dyndns/dyndnsc/default.nix | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 6a9a57d67c3b..1e4e3fde1e39 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -1,33 +1,57 @@ -{ lib, python3Packages, fetchPypi, stdenv }: +{ lib +, stdenv +, python3Packages +, fetchPypi +}: python3Packages.buildPythonApplication rec { pname = "dyndnsc"; version = "0.6.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "13078d29eea2f9a4ca01f05676c3309ead5e341dab047e0d51c46f23d4b7fbb4"; + hash = "sha256-EweNKe6i+aTKAfBWdsMwnq1eNB2rBH4NUcRvI9S3+7Q="; }; postPatch = '' - substituteInPlace setup.py --replace "bottle==" "bottle>=" + substituteInPlace setup.py \ + --replace-fail '"pytest-runner"' "" ''; - nativeBuildInputs = with python3Packages; [ pytest-runner ]; - propagatedBuildInputs = with python3Packages; [ - daemonocle - dnspython - netifaces - requests - json-logging + pythonRelaxDeps = [ + "bottle" + ]; + + build-system = with python3Packages; [ setuptools ]; - nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; + + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + ]; + + dependencies = with python3Packages; [ + daemonocle + dnspython + json-logging + netifaces + requests + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + bottle + pytest-console-scripts + pytestCheckHook + ]; disabledTests = [ # dnswanip connects to an external server to discover the # machine's IP address. "dnswanip" + # AssertionError + "test_null_dummy" ] ++ lib.optionals stdenv.isDarwin [ # The tests that spawn a server using Bottle cannot be run on # macOS or Windows as the default multiprocessing start method @@ -42,20 +66,21 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Dynamic DNS update client with support for multiple protocols"; - mainProgram = "dyndnsc"; longDescription = '' Dyndnsc is a command line client for sending updates to Dynamic - DNS (DDNS, DynDNS) services. It supports multiple protocols and - services, and it has native support for IPv6. The configuration - file allows using foreign, but compatible services. Dyndnsc + DNS (DDNS, DynDNS) services. It supports multiple protocols and + services, and it has native support for IPv6. The configuration + file allows using foreign, but compatible services. Dyndnsc ships many different IP detection mechanisms, support for configuring multiple services in one place and it has a daemon - mode for running unattended. It has a plugin system to provide + mode for running unattended. It has a plugin system to provide external notification services. ''; homepage = "https://github.com/infothrill/python-dyndnsc"; + changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; + mainProgram = "dyndnsc"; platforms = platforms.unix; }; } From a3b69628898f5389f57142b4343ed8e602029c8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:32:35 +0200 Subject: [PATCH 240/311] dyndnsc: format with nixfmt --- .../networking/dyndns/dyndnsc/default.nix | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 1e4e3fde1e39..930fc3460319 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, python3Packages -, fetchPypi +{ + lib, + stdenv, + python3Packages, + fetchPypi, }: python3Packages.buildPythonApplication rec { @@ -19,17 +20,11 @@ python3Packages.buildPythonApplication rec { --replace-fail '"pytest-runner"' "" ''; - pythonRelaxDeps = [ - "bottle" - ]; + pythonRelaxDeps = [ "bottle" ]; - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; - nativeBuildInputs = with python3Packages; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ daemonocle @@ -46,21 +41,23 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - disabledTests = [ - # dnswanip connects to an external server to discover the - # machine's IP address. - "dnswanip" - # AssertionError - "test_null_dummy" - ] ++ lib.optionals stdenv.isDarwin [ - # The tests that spawn a server using Bottle cannot be run on - # macOS or Windows as the default multiprocessing start method - # on those platforms is 'spawn', which requires the code to be - # run to be picklable, which this code isn't. - # Additionaly, other start methods are unsafe and prone to failure - # on macOS; see https://bugs.python.org/issue33725. - "BottleServer" - ]; + disabledTests = + [ + # dnswanip connects to an external server to discover the + # machine's IP address. + "dnswanip" + # AssertionError + "test_null_dummy" + ] + ++ lib.optionals stdenv.isDarwin [ + # The tests that spawn a server using Bottle cannot be run on + # macOS or Windows as the default multiprocessing start method + # on those platforms is 'spawn', which requires the code to be + # run to be picklable, which this code isn't. + # Additionaly, other start methods are unsafe and prone to failure + # on macOS; see https://bugs.python.org/issue33725. + "BottleServer" + ]; # Allow tests that bind or connect to localhost on macOS. __darwinAllowLocalNetworking = true; From 7721a54cc1d4d422f1ed3e1e8384fd2597ff0107 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Thu, 23 May 2024 11:18:56 +0800 Subject: [PATCH 241/311] python312Packages.datashape: fix build --- .../python-modules/datashape/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f6651a6c617..64d0afae90c1 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -7,6 +7,8 @@ numpy, multipledispatch, python-dateutil, + setuptools, + versioneer, }: let @@ -29,18 +31,28 @@ in buildPythonPackage rec { pname = "datashape"; version = "0.5.4"; - format = "setuptools"; + + pyproject = true; + build-system = [ + setuptools + versioneer + ]; src = fetcher { inherit pname version; sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; + postPatch = '' + # Remove vendorized versioneer.py + rm versioneer.py + ''; + nativeCheckInputs = [ pytest mock ]; - propagatedBuildInputs = [ + dependencies = [ numpy multipledispatch python-dateutil From 0cb467431976ffba7c2cb31020756c1ba764fa4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1nchez=20Medina?= Date: Thu, 23 May 2024 01:36:15 -0700 Subject: [PATCH 242/311] doc: autogenerate python interpreter table (#313408) * doc: autogenerate python interpreter table This serves as a practical example on generating documentation by inspection of the evaluated Nixpkgs tree. Co-authored-by: Valentin Gagarin --- doc/default.nix | 10 +++- doc/doc-support/python-interpreter-table.nix | 63 ++++++++++++++++++++ doc/languages-frameworks/python.section.md | 11 +--- 3 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 doc/doc-support/python-interpreter-table.nix diff --git a/doc/default.nix b/doc/default.nix index ca4091dc222c..14c828b02a06 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -105,7 +105,15 @@ in pkgs.stdenv.mkDerivation { ln -s ${optionsDoc.optionsJSON}/share/doc/nixos/options.json ./config-options.json ''; - buildPhase = '' + buildPhase = let + pythonInterpreterTable = pkgs.callPackage ./doc-support/python-interpreter-table.nix {}; + pythonSection = with lib.strings; replaceStrings + [ "@python-interpreter-table@" ] + [ pythonInterpreterTable ] + (readFile ./languages-frameworks/python.section.md); + in '' + cp ${builtins.toFile "python.section.md" pythonSection} ./languages-frameworks/python.section.md + cat \ ./functions/library.md.in \ ${lib-docs}/index.md \ diff --git a/doc/doc-support/python-interpreter-table.nix b/doc/doc-support/python-interpreter-table.nix new file mode 100644 index 000000000000..6f2b3422f672 --- /dev/null +++ b/doc/doc-support/python-interpreter-table.nix @@ -0,0 +1,63 @@ +# For debugging, run in this directory: +# nix eval --impure --raw --expr 'import ./python-interpreter-table.nix {}' +{ pkgs ? (import ../.. { config = { }; overlays = []; }) }: +let + lib = pkgs.lib; + inherit (lib.attrsets) attrNames filterAttrs; + inherit (lib.lists) elem filter map naturalSort reverseList; + inherit (lib.strings) concatStringsSep; + + isPythonInterpreter = name: + /* NB: Package names that don't follow the regular expression: + - `python-cosmopolitan` is not part of `pkgs.pythonInterpreters`. + - `_prebuilt` interpreters are used for bootstrapping internally. + - `python3Minimal` contains python packages, left behind conservatively. + - `rustpython` lacks `pythonVersion` and `implementation`. + */ + (lib.strings.match "(pypy|python)([[:digit:]]*)" name) != null; + + interpreterName = pname: + let + cuteName = { + cpython = "CPython"; + pypy = "PyPy"; + }; + interpreter = pkgs.${pname}; + in + "${cuteName.${interpreter.implementation}} ${interpreter.pythonVersion}"; + + interpreters = reverseList (naturalSort ( + filter isPythonInterpreter (attrNames pkgs.pythonInterpreters) + )); + + aliases = pname: + attrNames ( + filterAttrs (name: value: + isPythonInterpreter name + && name != pname + && interpreterName name == interpreterName pname + ) pkgs + ); + + result = map (pname: { + inherit pname; + aliases = aliases pname; + interpreter = interpreterName pname; + }) interpreters; + + toMarkdown = data: + let + line = package: '' + | ${package.pname} | ${join ", " package.aliases or [ ]} | ${package.interpreter} | + ''; + in + join "" (map line data); + + join = lib.strings.concatStringsSep; + +in +'' + | Package | Aliases | Interpeter | + |---------|---------|------------| + ${toMarkdown result} +'' diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 6fcae4b6520d..4c4ecf0fa278 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -4,16 +4,7 @@ ### Interpreters {#interpreters} -| Package | Aliases | Interpreter | -|------------|-----------------|-------------| -| python27 | python2, python | CPython 2.7 | -| python39 | | CPython 3.9 | -| python310 | | CPython 3.10 | -| python311 | python3 | CPython 3.11 | -| python312 | | CPython 3.12 | -| python313 | | CPython 3.13 | -| pypy27 | pypy2, pypy | PyPy2.7 | -| pypy39 | pypy3 | PyPy 3.9 | +@python-interpreter-table@ The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/python`. From aee13d3d9aaee0d1252de4863f3c818cec5f303f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 23 May 2024 10:43:33 +0200 Subject: [PATCH 243/311] nixos/wyoming*: depend on network-online.target Ordering it after network-online.target only makes sense, if it actually gets requested. --- .../services/home-automation/wyoming/faster-whisper.nix | 3 +++ .../modules/services/home-automation/wyoming/openwakeword.nix | 3 +++ nixos/modules/services/home-automation/wyoming/piper.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index d0fca6a41c7b..45664103665f 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -113,6 +113,9 @@ in nameValuePair "wyoming-faster-whisper-${server}" { inherit (options) enable; description = "Wyoming faster-whisper server instance ${server}"; + wants = [ + "network-online.target" + ]; after = [ "network-online.target" ]; diff --git a/nixos/modules/services/home-automation/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix index 856a4ef7366d..f9848970bf73 100644 --- a/nixos/modules/services/home-automation/wyoming/openwakeword.nix +++ b/nixos/modules/services/home-automation/wyoming/openwakeword.nix @@ -108,6 +108,9 @@ in config = mkIf cfg.enable { systemd.services."wyoming-openwakeword" = { description = "Wyoming openWakeWord server"; + wants = [ + "network-online.target" + ]; after = [ "network-online.target" ]; diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index 5b5f898d7ca3..a26fe8e84f60 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -117,6 +117,9 @@ in nameValuePair "wyoming-piper-${server}" { inherit (options) enable; description = "Wyoming Piper server instance ${server}"; + wants = [ + "network-online.target" + ]; after = [ "network-online.target" ]; From 310727880651a6f954400c58d808871ee60103cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:45:09 +0200 Subject: [PATCH 244/311] python312Packages.aiocache: disable performance tests --- pkgs/development/python-modules/aiocache/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 17e60970e4fa..54a2bfb88ef7 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -58,10 +58,15 @@ buildPythonPackage rec { ]; disabledTests = [ - # calls apache benchmark and fails, no usable output + # Test calls apache benchmark and fails, no usable output "test_concurrency_error_rates" ]; + disabledTestPaths = [ + # Benchmark and performance tests are not relevant for Nixpkgs + "tests/performance/" + ]; + preCheck = '' ${lib.getBin pkgs.redis}/bin/redis-server & REDIS_PID=$! @@ -83,7 +88,7 @@ buildPythonPackage rec { description = "Python API Rate Limit Decorator"; homepage = "https://github.com/aio-libs/aiocache"; changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; - license = with licenses; [ bsd3 ]; + license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; } From 6abca390a18180719047fdb5f3a106bdfbf0a140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:47:16 +0200 Subject: [PATCH 245/311] wapiti: refactor --- pkgs/tools/security/wapiti/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 13a7e55cc3ec..d87f3b45cf61 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -6,30 +6,32 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; version = "3.1.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "wapiti-scanner"; - repo = pname; + repo = "wapiti"; rev = "refs/tags/${version}"; hash = "sha256-2ssbczUa4pTA5Fai+sK1hES8skJMIHxa/R2hNIiEVLs="; }; postPatch = '' - # Ignore pinned versions - sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" pyproject.toml - # Remove code coverage checking substituteInPlace pyproject.toml \ --replace "--cov --cov-report=xml" "" ''; - nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ setuptools - wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + dependencies = with python3.pkgs; [ aiocache aiohttp aiosqlite @@ -154,7 +156,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://wapiti-scanner.github.io/"; changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti"; - license = with licenses; [ gpl2Only ]; + license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; } From aa7a7a91eda0c9923ff5bb0cf04c97dec7cdbfda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 10:47:39 +0200 Subject: [PATCH 246/311] wapiti: format with nixfmt --- pkgs/tools/security/wapiti/default.nix | 68 +++++++++++++------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index d87f3b45cf61..1ddfbb703b96 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -23,37 +24,36 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - dependencies = with python3.pkgs; [ - aiocache - aiohttp - aiosqlite - arsenic - beautifulsoup4 - browser-cookie3 - dnspython - h11 - httpcore - httpx - httpx-ntlm - loguru - mako - markupsafe - mitmproxy - pyasn1 - six - sqlalchemy - tld - yaswfp - ] ++ httpx.optional-dependencies.brotli - ++ httpx.optional-dependencies.socks; + dependencies = + with python3.pkgs; + [ + aiocache + aiohttp + aiosqlite + arsenic + beautifulsoup4 + browser-cookie3 + dnspython + h11 + httpcore + httpx + httpx-ntlm + loguru + mako + markupsafe + mitmproxy + pyasn1 + six + sqlalchemy + tld + yaswfp + ] + ++ httpx.optional-dependencies.brotli + ++ httpx.optional-dependencies.socks; __darwinAllowLocalNetworking = true; @@ -140,9 +140,7 @@ python3.pkgs.buildPythonApplication rec { "tests/attack/test_mod_ssl.py" ]; - pythonImportsCheck = [ - "wapitiCore" - ]; + pythonImportsCheck = [ "wapitiCore" ]; meta = with lib; { description = "Web application vulnerability scanner"; From f70ed7a5cbc262decaeb0921f057309847b8c621 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 10:01:53 +0200 Subject: [PATCH 247/311] roave-backward-compatibility-check: init at 8.8.0 --- .../package.nix | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ro/roave-backward-compatibility-check/package.nix diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix new file mode 100644 index 000000000000..df06fe6a803e --- /dev/null +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + php, + testers, + roave-backward-compatibility-check, +}: + +php.buildComposerProject (finalAttrs: { + pname = "roave-backward-compatibility-check"; + version = "8.8.0"; + + src = fetchFromGitHub { + owner = "Roave"; + repo = "BackwardCompatibilityCheck"; + rev = finalAttrs.version; + hash = "sha256-/9nJqZcuBLzgzDyoX4NHW9And7L/F+Bsm/gLzQS7QzE="; + }; + + vendorHash = "sha256-I8JZ4CBrrQmZ38QF9SPZtkPirCAxqSCeTUpMg59Mz7U="; + + passthru = { + tests.version = testers.testVersion { + package = roave-backward-compatibility-check; + version = finalAttrs.version; + }; + }; + + meta = { + changelog = "https://github.com/Roave/BackwardCompatibilityCheck/releases/tag/${finalAttrs.version}"; + description = "A tool that can be used to verify BC breaks between two versions of a PHP library"; + homepage = "https://github.com/Roave/BackwardCompatibilityCheck"; + license = lib.licenses.mit; + mainProgram = "roave-backward-compatibility-check"; + maintainers = lib.teams.php.members; + }; +}) From e05e1737b39e6dcb35b25e1795bd58ec7d597a2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:19:45 +0200 Subject: [PATCH 248/311] python312Packages.strawberry-graphql: refactor --- .../strawberry-graphql/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 92658dce5086..a791d1e6ebf6 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; version = "0.219.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -62,22 +62,16 @@ buildPythonPackage rec { url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; }) - (fetchpatch { - # https://github.com/strawberry-graphql/strawberry/pull/3255 - name = "fix-tests-with-pydantic_2.patch"; - url = "https://github.com/strawberry-graphql/strawberry/commit/0a0dc284ee6d31d4e82ac7ff1ed9fea4dff39fa6.patch"; - hash = "sha256-LACWD7XA6YL/apJwhpx3LPCKxKUfa+XWyTLK+Zkxlaw="; - }) ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--emoji --mypy-ini-file=mypy.ini" "" \ + --replace-fail "--emoji --mypy-ini-file=mypy.ini" "" \ ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ graphql-core python-dateutil typing-extensions @@ -169,16 +163,17 @@ buildPythonPackage rec { "tests/test_dataloaders.py" "tests/utils/test_pretty_print.py" "tests/websockets/test_graphql_transport_ws.py" + "tests/litestar/" ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "A GraphQL library for Python that leverages type annotations"; - mainProgram = "strawberry"; homepage = "https://strawberry.rocks"; changelog = "https://github.com/strawberry-graphql/strawberry/blob/${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ izorkin ]; + mainProgram = "strawberry"; }; } From 15a381be44ce630f086a1e3cc14ba94935db931b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:22:00 +0200 Subject: [PATCH 249/311] python312Packages.strawberry-graphql: 0.219.2 -> 0.230.0 Diff: https://github.com/strawberry-graphql/strawberry/compare/refs/tags/0.219.2...0.230.0 Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.230.0/CHANGELOG.md --- .../python-modules/strawberry-graphql/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index a791d1e6ebf6..86d9b8e49045 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -43,16 +43,16 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.219.2"; + version = "0.230.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-uIUETjzuDnlQp6wM7uxyLRSMT5uyrXFrI9NilcjP0BU="; + hash = "sha256-jhInHoOvPGIEoSddv8+30gY38L6XR5OEATUTdrHbNpA="; }; patches = [ @@ -129,9 +129,8 @@ buildPythonPackage rec { rich libcst ]; - # starlite = [ - # starlite - # ]; + # starlite = [ starlite ]; + # litestar = [ litestar ]; pyinstrument = [ pyinstrument ]; }; From 2c4b8f11935fab5edb58c61e574949fc3f1790ea Mon Sep 17 00:00:00 2001 From: Indexyz <7685264+5aaee9@users.noreply.github.com> Date: Thu, 23 May 2024 17:34:14 +0800 Subject: [PATCH 250/311] edge-runtime: 1.14.0 -> 1.53.1 --- pkgs/development/web/edge-runtime/Cargo.lock | 7117 +++++++++++++++++ pkgs/development/web/edge-runtime/default.nix | 44 +- .../web/edge-runtime/librusty_v8.nix | 10 +- 3 files changed, 7140 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/web/edge-runtime/Cargo.lock diff --git a/pkgs/development/web/edge-runtime/Cargo.lock b/pkgs/development/web/edge-runtime/Cargo.lock new file mode 100644 index 000000000000..d21116d0f79b --- /dev/null +++ b/pkgs/development/web/edge-runtime/Cargo.lock @@ -0,0 +1,7117 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aead-gcm-stream" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a09ecb526d53de2842cc876ee5c9b51161ee60399edeca4cf74892a01b48177" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-kw" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" +dependencies = [ + "aes", +] + +[[package]] +name = "ahash" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check 0.9.4", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +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 = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[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 = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +dependencies = [ + "serde", +] + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom 7.1.3", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "ast_node" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "async-tungstenite" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "tungstenite", +] + +[[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 = "auto_impl" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823b8bb275161044e2ac7a25879cb3e2480cb403e3943022c7c769c599b756aa" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "async-tungstenite", + "bytes", + "cityhash", + "cooked-waker", + "cpu_timer", + "ctor", + "deno_ast", + "deno_broadcast_channel", + "deno_canvas", + "deno_config", + "deno_console", + "deno_core", + "deno_crypto", + "deno_fetch", + "deno_fs", + "deno_http", + "deno_io", + "deno_net", + "deno_npm", + "deno_semver", + "deno_tls", + "deno_url", + "deno_web", + "deno_webgpu", + "deno_webidl", + "deno_websocket", + "enum-as-inner 0.6.0", + "eszip", + "event_worker", + "fastwebsockets 0.4.4", + "flume", + "futures-util", + "http 0.2.11", + "http_utils", + "httparse", + "hyper 0.14.28", + "import_map", + "log", + "monch", + "notify", + "once_cell", + "pin-project", + "reqwest", + "rustls-pemfile 2.1.0", + "sb_ai", + "sb_core", + "sb_env", + "sb_fs", + "sb_graph", + "sb_module_loader", + "sb_node", + "sb_npm", + "sb_os", + "sb_workers", + "scopeguard", + "serde", + "serial_test", + "thiserror", + "tls-listener", + "tokio", + "tokio-rustls 0.25.0", + "tokio-util", + "tungstenite", + "url", + "urlencoding", + "uuid", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base32" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "better_scoped_tls" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" +dependencies = [ + "scoped-tls", +] + +[[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.49.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c07087f3d5731bf3fb375a81841b99597e25dc11bd3bc72d16d43adf6624a6e" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "clap 2.34.0", + "env_logger 0.6.2", + "fxhash", + "lazy_static", + "log", + "peeking_take_while", + "proc-macro2 0.4.30", + "quote 0.6.13", + "regex", + "shlex", + "which 2.0.1", +] + +[[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 = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +dependencies = [ + "serde", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cache_control" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" + +[[package]] +name = "cauchy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff11ddd2af3b5e80dd0297fee6e56ac038d9bdc549573cdb51bd6d2efe7f05e" +dependencies = [ + "num-complex", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cblas-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6feecd82cce51b0204cf063f0041d69f24ce83f680d87514b004248e7b0fa65" +dependencies = [ + "libc", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" +dependencies = [ + "nom 4.2.3", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "winapi", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "cityhash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ecb82e5b6394ea8408bc8f454d50c75f339ca89f9af90a6ff8694e6a1c63da" +dependencies = [ + "bindgen", + "cc", + "clap 2.34.0", + "libc", +] + +[[package]] +name = "clang-sys" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" +dependencies = [ + "glob", + "libc", + "libloading 0.5.2", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "term_size", + "textwrap", + "unicode-width", + "vec_map", + "yaml-rust", +] + +[[package]] +name = "clap" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.0", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "base", + "clap 4.5.0", + "deno_core", + "dotenv-build", + "env_logger 0.10.2", + "glob", + "log", + "sb_graph", + "tokio", + "tracing-subscriber", +] + +[[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 = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "cooked-waker" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpu_timer" +version = "0.1.0" +dependencies = [ + "anyhow", + "ctor", + "futures", + "libc", + "log", + "nix", + "once_cell", + "signal-hook", + "signal-hook-tokio", + "tokio", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +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.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version 0.4.0", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.2", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.78", + "quote 1.0.35", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "data-url" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" + +[[package]] +name = "debugid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" +dependencies = [ + "serde", + "uuid", +] + +[[package]] +name = "deno_ast" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa239d4d69bb6c61bd73e0fc23e3688c7e87e1f47f2f37f4cff7a0080017299" +dependencies = [ + "anyhow", + "base64 0.21.7", + "deno_media_type", + "dprint-swc-ext", + "serde", + "swc_atoms", + "swc_bundler", + "swc_common", + "swc_config", + "swc_config_macro", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_codegen_macros", + "swc_ecma_dep_graph", + "swc_ecma_loader", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_transforms_optimization", + "swc_ecma_transforms_proposal", + "swc_ecma_transforms_react", + "swc_ecma_transforms_typescript", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_eq_ignore_macros", + "swc_graph_analyzer", + "swc_macros_common", + "swc_visit", + "swc_visit_macros", + "text_lines", + "url", +] + +[[package]] +name = "deno_broadcast_channel" +version = "0.130.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d0a2bcd833ba9aa02337c79108124a53e40b6491d78bb0588772fd62059c02" +dependencies = [ + "async-trait", + "deno_core", + "tokio", + "uuid", +] + +[[package]] +name = "deno_cache_dir" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbb245d9a3719b5eb2b5195aaaa25108c3c93d1762b181a20fb1af1c7703eaf" +dependencies = [ + "anyhow", + "deno_media_type", + "indexmap 2.2.3", + "log", + "once_cell", + "parking_lot", + "ring", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "deno_canvas" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cefb86183b4156b4222f128be746c5c96e3528e95eedc6f819f3cd57ecf7b3e" +dependencies = [ + "deno_core", + "deno_webgpu", + "image", + "serde", + "tokio", +] + +[[package]] +name = "deno_config" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aca0a5b9d2693efb14c8c80d66a052464f24cbf6b3473648037e282c0c616917" +dependencies = [ + "anyhow", + "glob", + "indexmap 2.2.3", + "jsonc-parser", + "log", + "percent-encoding", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "deno_console" +version = "0.136.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598ab6c4aeb4bd4e3e31d90b8f6dd772f25ed92fc979ff12c641074ef4553030" +dependencies = [ + "deno_core", +] + +[[package]] +name = "deno_core" +version = "0.256.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd5997286bcc46199bbae727f43ee65cf4bd073ac2d240a36a6ceae3bfab14ac" +dependencies = [ + "anyhow", + "bit-set", + "bit-vec", + "bytes", + "cooked-waker", + "deno_core_icudata", + "deno_ops", + "deno_unsync", + "futures", + "libc", + "log", + "memoffset 0.9.0", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "serde_v8", + "smallvec", + "sourcemap 7.0.1", + "static_assertions", + "tokio", + "url", + "v8", +] + +[[package]] +name = "deno_core_icudata" +version = "0.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1" + +[[package]] +name = "deno_crypto" +version = "0.150.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe3cc83b7fe945183ef27be203c54276abef9fbda4844722f10e0af341a316fd" +dependencies = [ + "aes", + "aes-gcm", + "aes-kw", + "base64 0.21.7", + "cbc", + "const-oid", + "ctr", + "curve25519-dalek", + "deno_core", + "deno_web", + "elliptic-curve", + "num-traits", + "once_cell", + "p256", + "p384", + "p521", + "rand", + "ring", + "rsa", + "serde", + "serde_bytes", + "sha1", + "sha2", + "signature", + "spki", + "tokio", + "uuid", + "x25519-dalek", +] + +[[package]] +name = "deno_fetch" +version = "0.160.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5860515fb73057028018761e937edc4c910207d40d9d9721bb0bb1dfc355fb54" +dependencies = [ + "bytes", + "data-url", + "deno_core", + "deno_tls", + "dyn-clone", + "http 0.2.11", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-util", +] + +[[package]] +name = "deno_fs" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3eae95f88e4c5a348586b0f9d0d6f3e94aa89c6457f299d9cefed7f1ad4a30" +dependencies = [ + "async-trait", + "deno_core", + "deno_io", + "filetime", + "fs3", + "libc", + "log", + "nix", + "rand", + "rayon", + "serde", + "tokio", + "winapi", +] + +[[package]] +name = "deno_graph" +version = "0.64.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0eb6ad784fa5885867ba00e0db8ddcb2d98a4a0234fe336d50a13092e268c44" +dependencies = [ + "anyhow", + "async-trait", + "data-url", + "deno_ast", + "deno_semver", + "encoding_rs", + "futures", + "import_map", + "indexmap 2.2.3", + "log", + "monch", + "once_cell", + "parking_lot", + "regex", + "serde", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "deno_http" +version = "0.133.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94007415787d966f964fb2c46ce81721a9de3a23943f22935dae9c56dfad77ec" +dependencies = [ + "async-compression", + "async-trait", + "base64 0.21.7", + "brotli", + "bytes", + "cache_control", + "deno_core", + "deno_net", + "deno_websocket", + "flate2", + "http 0.2.11", + "http 1.0.0", + "httparse", + "hyper 0.14.28", + "hyper 1.1.0", + "hyper-util", + "itertools 0.10.5", + "memmem", + "mime", + "once_cell", + "percent-encoding", + "phf", + "pin-project", + "ring", + "scopeguard", + "serde", + "smallvec", + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] +name = "deno_io" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "484a121382c19f70413bb43c4a1d79a8feab6f84edd0efaaee28ef4ea3a70926" +dependencies = [ + "async-trait", + "deno_core", + "filetime", + "fs3", + "once_cell", + "tokio", + "winapi", +] + +[[package]] +name = "deno_lockfile" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f348633cc4425b2a9011436e256b1ae8f6c8026ec2705d852baee8643dc5562" +dependencies = [ + "ring", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "deno_media_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" +dependencies = [ + "data-url", + "serde", + "url", +] + +[[package]] +name = "deno_native_certs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4785d0bdc13819b665b71e4fb7e119d859568471e4c245ec5610857e70c9345" +dependencies = [ + "dlopen2", + "dlopen2_derive", + "once_cell", + "rustls-native-certs", + "rustls-pemfile 1.0.4", +] + +[[package]] +name = "deno_net" +version = "0.128.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342543e781289ca794756301f4ea9e08185ecc63843c135c719b5a29f51857" +dependencies = [ + "deno_core", + "deno_tls", + "enum-as-inner 0.5.1", + "log", + "pin-project", + "rustls-tokio-stream", + "serde", + "socket2", + "tokio", + "trust-dns-proto", + "trust-dns-resolver", +] + +[[package]] +name = "deno_npm" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "376262760b173ff01f8f5d05d58a64f6d863472396afb5582590fa0949342854" +dependencies = [ + "anyhow", + "async-trait", + "deno_lockfile", + "deno_semver", + "futures", + "log", + "monch", + "serde", + "thiserror", +] + +[[package]] +name = "deno_ops" +version = "0.132.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02163d08afdd6fcf21e37c399c7425987c7170203a853052a800e80c91c2e87b" +dependencies = [ + "proc-macro-rules", + "proc-macro2 1.0.78", + "quote 1.0.35", + "strum", + "strum_macros", + "syn 2.0.48", + "thiserror", +] + +[[package]] +name = "deno_semver" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49e14effd9df8ed261f7a1a34ac19bbaf0fa940c59bd19a6d8313cf41525e1c" +dependencies = [ + "monch", + "once_cell", + "serde", + "thiserror", + "url", +] + +[[package]] +name = "deno_tls" +version = "0.123.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "334380ef454db2148df9aba7541bc8250bb4e6fb183ece9fdb293be0462eb7ad" +dependencies = [ + "deno_core", + "deno_native_certs", + "once_cell", + "rustls 0.21.11", + "rustls-pemfile 1.0.4", + "rustls-webpki 0.101.7", + "serde", + "webpki-roots", +] + +[[package]] +name = "deno_unsync" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30dff7e03584dbae188dae96a0f1876740054809b2ad0cf7c9fc5d361f20e739" +dependencies = [ + "tokio", +] + +[[package]] +name = "deno_url" +version = "0.136.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7978221ce33221ac7a18b649a5a18fe7983fbe2fddf5a6959fc672089c10f9a9" +dependencies = [ + "deno_core", + "serde", + "urlpattern", +] + +[[package]] +name = "deno_web" +version = "0.167.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67d78f50e55155b77abbf8fa6bdc24f68442c91742e03b67b66cc258f4b31cd1" +dependencies = [ + "async-trait", + "base64-simd", + "bytes", + "deno_core", + "encoding_rs", + "flate2", + "futures", + "serde", + "tokio", + "uuid", + "windows-sys 0.48.0", +] + +[[package]] +name = "deno_webgpu" +version = "0.103.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef171e8bc24e2c3e6934543784832fb5c3b29f0385f23ff604fc84c103d1283" +dependencies = [ + "deno_core", + "raw-window-handle", + "serde", + "tokio", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "deno_webidl" +version = "0.136.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41eff4e69896e0f7fc432271c369052efd1d0b57a3d352688e2df800d1aa8dd9" +dependencies = [ + "deno_core", +] + +[[package]] +name = "deno_websocket" +version = "0.141.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370c0f3137a37362a4737b92a4838ce2e848ee1a99ca7a4fc840293d15d841c4" +dependencies = [ + "bytes", + "deno_core", + "deno_net", + "deno_tls", + "fastwebsockets 0.6.0", + "h2 0.4.4", + "http 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "once_cell", + "rustls-tokio-stream", + "serde", + "tokio", +] + +[[package]] +name = "deno_webstorage" +version = "0.131.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cec9b81da6c28b78b801f995b167e021c9a0f8364080cabbd5eead7112be0032" +dependencies = [ + "deno_core", + "deno_web", + "rusqlite", + "serde", +] + +[[package]] +name = "deno_whoami" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75e4caa92b98a27f09c671d1399aee0f5970aa491b9a598523aac000a2192e3" +dependencies = [ + "libc", + "whoami", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom 7.1.3", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2 1.0.78", + "quote 1.0.35", + "rustc_version 0.4.0", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "dlopen2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bc2c7ed06fd72a8513ded8d0d2f6fd2655a85d6885c48cae8625d80faf28c03" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + +[[package]] +name = "dlopen2_derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "dotenv-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4547f16c17f6051a12cdb8c62b803f94bee6807c74aa7c530b30b737df981fc" + +[[package]] +name = "dprint-swc-ext" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2f24ce6b89a06ae3eb08d5d4f88c05d0aef1fa58e2eba8dd92c97b84210c25" +dependencies = [ + "bumpalo", + "num-bigint", + "rustc-hash", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "text_lines", +] + +[[package]] +name = "dsa" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" +dependencies = [ + "digest", + "num-bigint-dig", + "num-traits", + "pkcs8", + "rfc6979", + "sha2", + "signature", + "zeroize", +] + +[[package]] +name = "dyn-clone" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" + +[[package]] +name = "ecb" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" +dependencies = [ + "cipher", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if 1.0.0", +] + +[[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 1.0.78", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "env_logger" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +dependencies = [ + "atty", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime 2.1.0", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[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" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[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 = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" + +[[package]] +name = "eszip" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a060f8bb81229bd98c26e1c0efc066be2460558ee9187e73e40a89bd2c949f06" +dependencies = [ + "anyhow", + "base64 0.21.7", + "deno_ast", + "deno_graph", + "deno_npm", + "deno_semver", + "futures", + "hashlink", + "serde", + "serde_json", + "sha2", + "thiserror", + "url", +] + +[[package]] +name = "event_worker" +version = "0.1.0" +dependencies = [ + "anyhow", + "deno_core", + "log", + "serde", + "tokio", + "uuid", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", +] + +[[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 = "faster-hex" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +dependencies = [ + "serde", +] + +[[package]] +name = "fastwebsockets" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6185b6dc9dddc4db0dedd2e213047e93bcbf7a0fb092abc4c4e4f3195efdb4" +dependencies = [ + "base64 0.21.7", + "hyper 0.14.28", + "pin-project", + "rand", + "sha1", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "fastwebsockets" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" +dependencies = [ + "base64 0.21.7", + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "pin-project", + "rand", + "sha1", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "from_variant" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" +dependencies = [ + "proc-macro2 1.0.78", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "fs3" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb17cf6ed704f72485332f6ab65257460c4f9f3083934cf402bf9f5b3b600a90" +dependencies = [ + "libc", + "rustc_version 0.2.3", + "winapi", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check 0.9.4", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +dependencies = [ + "backtrace", + "log", + "presser", + "thiserror", + "winapi", + "windows", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.2", + "gpu-descriptor-types", + "hashbrown 0.14.3", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.2", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.11", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] + +[[package]] +name = "halfbrown" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" +dependencies = [ + "hashbrown 0.13.2", + "serde", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + +[[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.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[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 = "hstr" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "phf", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + +[[package]] +name = "http_utils" +version = "0.1.0" +dependencies = [ + "bytes", + "futures-util", + "http 0.2.11", + "hyper 0.14.28", + "tokio", + "tokio-util", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.11", + "hyper 0.14.28", + "rustls 0.21.11", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2", + "tokio", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", +] + +[[package]] +name = "import_map" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ecd467768fe83c2860e70e5de5297a7366a230ff53e1da2158bdac2384cd39d" +dependencies = [ + "indexmap 1.9.3", + "log", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "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 = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +dependencies = [ + "Inflector", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.6", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonc-parser" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7725c320caac8c21d8228c1d055af27a995d371f78cc763073d3e068323641b5" +dependencies = [ + "serde_json", +] + +[[package]] +name = "k256" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "once_cell", + "sha2", + "signature", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lapack" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a7f0050af10913bc5e4f6091df38870cb5d4e45094d3dd551c1aff9d1d59b26" +dependencies = [ + "lapack-sys", + "libc", + "num-complex", +] + +[[package]] +name = "lapack-sys" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1d3a8a9f07310243de6c6226f039f14bce8d2f4c96b5d30ddbcfa31eb4e94ad" +dependencies = [ + "libc", +] + +[[package]] +name = "lax" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd3ec1cacffe7a44aee66f9e85d87e3ac69b472b546449884bd1fc1ca8ab359" +dependencies = [ + "cauchy", + "lapack", + "num-traits", + "thiserror", +] + +[[package]] +name = "lazy-regex" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" +dependencies = [ + "lazy-regex-proc_macros", + "once_cell", + "regex", +] + +[[package]] +name = "lazy-regex-proc_macros" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "regex", + "syn 2.0.48", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[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 = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +dependencies = [ + "cc", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libsqlite3-sys" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +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 = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[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 = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if 1.0.0", + "digest", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmem" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[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.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "monch" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" + +[[package]] +name = "monostate" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c2a1f1c70e5724fa28f101ca787b6a7e8ad5c5e4ae4ca3b0fa4a419fa9075" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f686d68a09079e63b1d2c64aa305095887ce50565f00a922ebfaeeee0d9ba6ce" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "naga" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +dependencies = [ + "bit-set", + "bitflags 2.4.2", + "codespan-reporting", + "hexf-parse", + "indexmap 2.2.3", + "log", + "num-traits", + "rustc-hash", + "serde", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndarray" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +dependencies = [ + "approx", + "cblas-sys", + "libc", + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", +] + +[[package]] +name = "ndarray-linalg" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f87ff36428f228c6056204d0f5cb8c5165f0db0a065429faace3edbc2718f1f" +dependencies = [ + "cauchy", + "lax", + "ndarray", + "num-complex", + "num-traits", + "rand", + "thiserror", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + +[[package]] +name = "nom" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +dependencies = [ + "memchr", + "version_check 0.1.5", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.2", + "filetime", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +dependencies = [ + "num-traits", + "rand", + "serde", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.6", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[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 = "ort" +version = "2.0.0-rc.0" +source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f" +dependencies = [ + "half", + "libloading 0.8.1", + "ndarray", + "ort-sys", + "thiserror", + "tracing", +] + +[[package]] +name = "ort-sys" +version = "2.0.0-rc.0" +source = "git+https://github.com/pykeio/ort#2abc210f3958c5b94528cc71c6c8781813a2cc2f" + +[[package]] +name = "outref" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p224" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c06436d66652bc2f01ade021592c80a2aad401570a18aa18b82e440d2b9aa1" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-clean" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.3", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + +[[package]] +name = "pmutil" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-rules" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" +dependencies = [ + "proc-macro-rules-macros", + "proc-macro2 1.0.78", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro-rules-macros" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "207fffb0fe655d1d47f6af98cc2793405e85929bdbc420d685554ff07be27ac7" +dependencies = [ + "once_cell", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2 1.0.78", +] + +[[package]] +name = "radix_fmt" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" + +[[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 = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ref-cast" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" + +[[package]] +name = "reqwest" +version = "0.11.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.11", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-rustls 0.24.1", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots", + "winreg", +] + +[[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 = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "bitflags 2.4.2", + "serde", + "serde_derive", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rusqlite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +dependencies = [ + "bitflags 2.4.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.21", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom 7.1.3", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno 0.3.8", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] +name = "rustls-tokio-stream" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded7a36e8ac05b8ada77a84c5ceec95361942ee9dedb60a82f93f788a791aae8" +dependencies = [ + "futures", + "rustls 0.21.11", + "socket2", + "tokio", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "ryu-js" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" + +[[package]] +name = "salsa20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" +dependencies = [ + "cipher", +] + +[[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 = "sb_ai" +version = "0.1.0" +dependencies = [ + "anyhow", + "deno_core", + "log", + "ndarray", + "ndarray-linalg", + "once_cell", + "ort", + "rand", + "serde", + "tokenizers", + "tokio", +] + +[[package]] +name = "sb_core" +version = "0.1.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bytes", + "cache_control", + "chrono", + "data-url", + "deno_ast", + "deno_cache_dir", + "deno_core", + "deno_crypto", + "deno_fetch", + "deno_fs", + "deno_graph", + "deno_http", + "deno_net", + "deno_tls", + "deno_web", + "deno_websocket", + "deno_webstorage", + "encoding_rs", + "enum-as-inner 0.6.0", + "faster-hex", + "fs3", + "futures", + "http 0.2.11", + "httparse", + "hyper 0.14.28", + "import_map", + "indexmap 2.2.3", + "libc", + "log", + "memmem", + "once_cell", + "percent-encoding", + "ring", + "sb_node", + "scopeguard", + "serde", + "thiserror", + "tokio", + "tokio-util", + "twox-hash", +] + +[[package]] +name = "sb_env" +version = "0.1.0" +dependencies = [ + "deno_core", + "sb_core", + "sb_node", +] + +[[package]] +name = "sb_fs" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "deno_ast", + "deno_core", + "deno_fs", + "deno_io", + "deno_npm", + "deno_semver", + "eszip", + "import_map", + "log", + "once_cell", + "sb_core", + "sb_node", + "sb_npm", + "serde", + "thiserror", + "tokio", +] + +[[package]] +name = "sb_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "deno_ast", + "deno_config", + "deno_core", + "deno_fs", + "deno_lockfile", + "deno_npm", + "deno_semver", + "deno_web", + "eszip", + "glob", + "import_map", + "log", + "once_cell", + "sb_core", + "sb_fs", + "sb_node", + "sb_npm", + "serde", + "tokio", + "urlencoding", +] + +[[package]] +name = "sb_module_loader" +version = "0.1.0" +dependencies = [ + "anyhow", + "deno_ast", + "deno_core", + "deno_fs", + "deno_npm", + "deno_semver", + "deno_tls", + "eszip", + "import_map", + "log", + "monch", + "once_cell", + "sb_core", + "sb_fs", + "sb_graph", + "sb_node", + "sb_npm", + "serde", + "tokio", +] + +[[package]] +name = "sb_node" +version = "0.1.0" +dependencies = [ + "aead-gcm-stream", + "aes", + "brotli", + "bytes", + "cbc", + "const-oid", + "data-encoding", + "deno_core", + "deno_fetch", + "deno_fs", + "deno_media_type", + "deno_net", + "deno_whoami", + "digest", + "dsa", + "ecb", + "elliptic-curve", + "errno 0.2.8", + "h2 0.3.26", + "hex", + "hkdf", + "http 0.2.11", + "idna 0.3.0", + "indexmap 2.2.3", + "k256", + "lazy-regex", + "libc", + "libz-sys", + "md-5", + "md4", + "nix", + "num-bigint", + "num-bigint-dig", + "num-integer", + "num-traits", + "once_cell", + "p224", + "p256", + "p384", + "path-clean", + "pbkdf2", + "pin-project-lite", + "rand", + "regex", + "reqwest", + "ring", + "ripemd", + "rsa", + "scrypt", + "serde", + "sha-1", + "sha2", + "signature", + "simd-json", + "tokio", + "typenum", + "url", + "winapi", + "windows-sys 0.48.0", + "x25519-dalek", + "x509-parser", +] + +[[package]] +name = "sb_npm" +version = "0.1.0" +dependencies = [ + "async-trait", + "base32", + "base64 0.21.7", + "bincode", + "deno_ast", + "deno_core", + "deno_fs", + "deno_graph", + "deno_lockfile", + "deno_npm", + "deno_semver", + "flate2", + "hex", + "indexmap 2.2.3", + "log", + "once_cell", + "percent-encoding", + "ring", + "sb_core", + "sb_node", + "serde", + "tar", + "thiserror", +] + +[[package]] +name = "sb_os" +version = "0.1.0" +dependencies = [ + "deno_core", + "libc", + "sb_core", + "serde", +] + +[[package]] +name = "sb_workers" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes", + "deno_config", + "deno_core", + "deno_http", + "enum-as-inner 0.6.0", + "event_worker", + "futures-util", + "http_utils", + "hyper 0.14.28", + "log", + "sb_core", + "sb_graph", + "scopeguard", + "serde", + "thiserror", + "tokio", + "tokio-util", + "uuid", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scrypt" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" +dependencies = [ + "password-hash", + "pbkdf2", + "salsa20", + "sha2", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.113" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +dependencies = [ + "indexmap 2.2.3", + "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_v8" +version = "0.165.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88862d513bcbc04a7f93b0f454dffd0b01a5c0d8e1964c7532ec55f52b9a6351" +dependencies = [ + "bytes", + "derive_more", + "num-bigint", + "serde", + "smallvec", + "thiserror", + "v8", +] + +[[package]] +name = "serial_test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signal-hook-tokio" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" +dependencies = [ + "futures-core", + "libc", + "signal-hook", + "tokio", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd-json" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2faf8f101b9bc484337a6a6b0409cf76c139f2fb70a9e3aee6b6774be7bfbf76" +dependencies = [ + "getrandom", + "halfbrown", + "lexical-core", + "ref-cast", + "serde", + "serde_json", + "simdutf8", + "value-trait", +] + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check 0.9.4", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check 0.9.4", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sourcemap" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" +dependencies = [ + "data-encoding", + "debugid", + "if_chain", + "rustc_version 0.2.3", + "serde", + "serde_json", + "unicode-id", + "url", +] + +[[package]] +name = "sourcemap" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10da010a590ed2fa9ca8467b00ce7e9c5a8017742c0c09c45450efc172208c4b" +dependencies = [ + "data-encoding", + "debugid", + "if_chain", + "rustc_version 0.2.3", + "serde", + "serde_json", + "unicode-id", + "url", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom 7.1.3", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if 1.0.0", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string_enum" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2 1.0.78", + "quote 1.0.35", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "swc_atoms" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" +dependencies = [ + "hstr", + "once_cell", + "rustc-hash", + "serde", +] + +[[package]] +name = "swc_bundler" +version = "0.223.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7530df85b1a56f6a879ca102dc59718db4bcd6bfff55fb8bb379fbeab6c88c" +dependencies = [ + "anyhow", + "crc", + "indexmap 2.2.3", + "is-macro", + "once_cell", + "parking_lot", + "petgraph", + "radix_fmt", + "relative-path", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_loader", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_fast_graph", + "swc_graph_analyzer", + "tracing", +] + +[[package]] +name = "swc_common" +version = "0.33.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b3ae36feceded27f0178dc9dabb49399830847ffb7f866af01798844de8f973" +dependencies = [ + "ast_node", + "better_scoped_tls", + "cfg-if 1.0.0", + "either", + "from_variant", + "new_debug_unreachable", + "num-bigint", + "once_cell", + "rustc-hash", + "serde", + "siphasher", + "sourcemap 6.4.1", + "swc_atoms", + "swc_eq_ignore_macros", + "swc_visit", + "tracing", + "unicode-width", + "url", +] + +[[package]] +name = "swc_config" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112884e66b60e614c0f416138b91b8b82b7fea6ed0ecc5e26bad4726c57a6c99" +dependencies = [ + "indexmap 2.2.3", + "serde", + "serde_json", + "swc_config_macro", +] + +[[package]] +name = "swc_config_macro" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_ast" +version = "0.110.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b" +dependencies = [ + "bitflags 2.4.2", + "is-macro", + "num-bigint", + "phf", + "scoped-tls", + "serde", + "string_enum", + "swc_atoms", + "swc_common", + "unicode-id", +] + +[[package]] +name = "swc_ecma_codegen" +version = "0.146.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b61ca275e3663238b71c4b5da8e6fb745bde9989ef37d94984dfc81fc6d009" +dependencies = [ + "memchr", + "num-bigint", + "once_cell", + "rustc-hash", + "serde", + "sourcemap 6.4.1", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen_macros", + "tracing", +] + +[[package]] +name = "swc_ecma_codegen_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_dep_graph" +version = "0.113.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fc6ac1a84afe910182dcda33d70a16545e6058529d51afb63bd6be8764370f" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_loader" +version = "0.45.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5713ab3429530c10bdf167170ebbde75b046c8003558459e4de5aaec62ce0f1" +dependencies = [ + "anyhow", + "pathdiff", + "serde", + "swc_common", + "tracing", +] + +[[package]] +name = "swc_ecma_parser" +version = "0.141.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294" +dependencies = [ + "either", + "new_debug_unreachable", + "num-bigint", + "num-traits", + "phf", + "serde", + "smallvec", + "smartstring", + "stacker", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "tracing", + "typed-arena", +] + +[[package]] +name = "swc_ecma_transforms_base" +version = "0.135.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d4ab26ec124b03e47f54d4daade8e9a9dcd66d3a4ca3cd47045f138d267a60e" +dependencies = [ + "better_scoped_tls", + "bitflags 2.4.2", + "indexmap 2.2.3", + "once_cell", + "phf", + "rustc-hash", + "serde", + "smallvec", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_utils", + "swc_ecma_visit", + "tracing", +] + +[[package]] +name = "swc_ecma_transforms_classes" +version = "0.124.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fe4376c024fa04394cafb8faecafb4623722b92dbbe46532258cc0a6b569d9c" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_macros" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "swc_ecma_transforms_optimization" +version = "0.196.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fec185cf4d18e90b7c8b18b0d1f04a5707e6f4c7b57c1bfd5086392cd07b75a9" +dependencies = [ + "dashmap", + "indexmap 2.2.3", + "once_cell", + "petgraph", + "rustc-hash", + "serde_json", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_fast_graph", + "tracing", +] + +[[package]] +name = "swc_ecma_transforms_proposal" +version = "0.169.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed89d6ff74f60de490fb56e1cc505b057905e36c13d405d7d61dd5c9f6ee8fc9" +dependencies = [ + "either", + "rustc-hash", + "serde", + "smallvec", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_react" +version = "0.181.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31a2f879fd21d18080b6c42e633e0ae8c6f3d54b83c1de876767d82b458c999" +dependencies = [ + "base64 0.21.7", + "dashmap", + "indexmap 2.2.3", + "once_cell", + "serde", + "sha-1", + "string_enum", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_typescript" +version = "0.186.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4263372cc7cd1a3b4570ccf7438f3c1e1575f134fd05cdf074edb322480a5b" +dependencies = [ + "ryu-js", + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_react", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_utils" +version = "0.125.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890" +dependencies = [ + "indexmap 2.2.3", + "num_cpus", + "once_cell", + "rustc-hash", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_visit", + "tracing", + "unicode-id", +] + +[[package]] +name = "swc_ecma_visit" +version = "0.96.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf" +dependencies = [ + "num-bigint", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_visit", + "tracing", +] + +[[package]] +name = "swc_eq_ignore_macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "swc_fast_graph" +version = "0.21.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acfc056067a0fbfe26a4763c1eb246e813fdbe6b376415d07915e96e15481b6" +dependencies = [ + "indexmap 2.2.3", + "petgraph", + "rustc-hash", + "swc_common", +] + +[[package]] +name = "swc_graph_analyzer" +version = "0.22.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e0110c0433c27221f03e45419b7e18d1db4d472db309088caa458ac2f304e" +dependencies = [ + "auto_impl", + "petgraph", + "swc_common", + "swc_fast_graph", + "tracing", +] + +[[package]] +name = "swc_macros_common" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "swc_visit" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" +dependencies = [ + "either", + "swc_visit_macros", +] + +[[package]] +name = "swc_visit_macros" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" +dependencies = [ + "Inflector", + "pmutil", + "proc-macro2 1.0.78", + "quote 1.0.35", + "swc_macros_common", + "syn 2.0.48", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.109", + "unicode-xid 0.2.4", +] + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "text_lines" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf" +dependencies = [ + "serde", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "term_size", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tls-listener" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c" +dependencies = [ + "futures-util", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-rustls 0.25.0", +] + +[[package]] +name = "tokenizers" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dd47962b0ba36e7fd33518fbf1754d136fd1474000162bbf2a8b5fcb2d3654d" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.2", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.11", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", + "tokio", +] + +[[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-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "hashbrown 0.14.3", + "pin-project-lite", + "tokio", + "tracing", +] + +[[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.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +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 1.0.0", + "data-encoding", + "enum-as-inner 0.5.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.2.3", + "ipnet", + "lazy_static", + "rand", + "serde", + "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 1.0.0", + "futures-util", + "ipconfig", + "lazy_static", + "lru-cache", + "parking_lot", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "rand", + "static_assertions", +] + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[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-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 = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check 0.9.4", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-id" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[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-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna 0.4.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "urlpattern" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "v8" +version = "0.83.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f6c8a960dd2eb74b22eda64f7e9f3d1688f82b80202828dc0425ebdeda826ef" +dependencies = [ + "bitflags 2.4.2", + "fslock", + "once_cell", + "which 5.0.0", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "value-trait" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad8db98c1e677797df21ba03fca7d3bf9bec3ca38db930954e4fe6e1ea27eb4" +dependencies = [ + "float-cmp", + "halfbrown", + "itoa", + "ryu", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote 1.0.35", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "wgpu-core" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.2", + "codespan-reporting", + "log", + "naga", + "parking_lot", + "profiling", + "raw-window-handle", + "ron", + "rustc-hash", + "serde", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.2", + "block", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +dependencies = [ + "bitflags 2.4.2", + "js-sys", + "serde", + "web-sys", +] + +[[package]] +name = "which" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" +dependencies = [ + "failure", + "libc", +] + +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall", + "wasite", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +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" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs", + "data-encoding", + "der-parser", + "lazy_static", + "nom 7.1.3", + "oid-registry", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "yaml-rust" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix index a8e9dbe824a4..dcb30c61625a 100644 --- a/pkgs/development/web/edge-runtime/default.nix +++ b/pkgs/development/web/edge-runtime/default.nix @@ -11,7 +11,7 @@ let pname = "edge-runtime"; - version = "1.14.0"; + version = "1.53.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,11 +20,17 @@ rustPlatform.buildRustPackage { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-63XStzO4Jt6ObWuzcBf2QwCIWsStXvhQ0XaJabELhWg="; + hash = "sha256-qEEFEeAyUOnNvxIBfAmhMDWde3OPOpyaEI2pBYrdCr0="; fetchSubmodules = true; }; - cargoHash = "sha256-JwwdvvpqgSbl0Xyb5pQ5hzZRrrCnDSjwV+ikdO2pXCk="; + cargoLock = { + lockFile = ./Cargo.lock; + + outputHashes = { + "ort-2.0.0-rc.0" = "sha256-j3g9ES2ZLmAAcPYgszBGDG16HiFJTnohwxSvXypFGTw="; + }; + }; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; @@ -35,33 +41,19 @@ rustPlatform.buildRustPackage { # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; + # For version tag + GIT_V_TAG = version; + passthru.updateScript = nix-update-script { }; - preCheck = '' - export HOME=$(mktemp -d) + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/edge-runtime --help + runHook postInstallCheck ''; - checkFlags = [ - # tries to make a network access - "--skip=deno_runtime::test::test_main_rt_fs" - "--skip=deno_runtime::test::test_main_runtime_creation" - "--skip=deno_runtime::test::test_os_env_vars" - "--skip=deno_runtime::test::test_os_ops" - "--skip=deno_runtime::test::test_user_runtime_creation" - "--skip=test_custom_readable_stream_response" - "--skip=test_import_map_file_path" - "--skip=test_import_map_inline" - "--skip=test_main_worker_options_request" - "--skip=test_main_worker_post_request" - "--skip=test_null_body_with_204_status" - "--skip=test_null_body_with_204_status_post" - "--skip=test_file_upload" - "--skip=test_oak_server" - "--skip=test_tls_throw_invalid_data" - "--skip=test_user_worker_json_imports" - "--skip=node::analyze::tests::test_esm_code_with_node_globals" - "--skip=node::analyze::tests::test_esm_code_with_node_globals_with_shebang" - ]; + doCheck = false; meta = with lib; { description = "A server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services"; diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 1e0a306c13b6..7e8f9eafc498 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.74.3"; + version = "0.83.2"; shas = { - x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; - aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; - x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; - aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; + x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk="; + aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI="; + x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU="; + aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o="; }; } From 85c301252a5d34e749bf13282a346ddddcf52f9e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 23 May 2024 10:37:28 +0200 Subject: [PATCH 251/311] .git-blame-ignore-revs: add PHP packages reformating Related to https://github.com/NixOS/nixpkgs/pull/309112 --- .git-blame-ignore-revs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 3ce4c34c30f3..f079fba5eaac 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -109,6 +109,10 @@ fb0e5be84331188a69b3edd31679ca6576edb75a # postgresql: move packages.nix to ext/default.nix 719034f6f6749d624faa28dff259309fc0e3e730 +# php ecosystem: reformat with nixfmt-rfc-style +75ae7621330ff8db944ce4dff4374e182d5d151f +c759efa5e7f825913f9a69ef20f025f50f56dc4d + # pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01 3fe3b055adfc020e6a923c466b6bcd978a13069a From f1dfd96632a5e7d83abd8eee3771159f7c1b0a43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 11:53:38 +0200 Subject: [PATCH 252/311] python312Packages.aiosasl: fix broken tests on Python 3.12 https://github.com/horazont/aiosasl/issues/28 --- pkgs/development/python-modules/aiosasl/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiosasl/default.nix b/pkgs/development/python-modules/aiosasl/default.nix index 81f96c4d1b1b..fe977cc1bbec 100644 --- a/pkgs/development/python-modules/aiosasl/default.nix +++ b/pkgs/development/python-modules/aiosasl/default.nix @@ -5,13 +5,16 @@ fetchpatch, pyopenssl, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiosasl"; version = "0.5.0"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "horazont"; @@ -28,6 +31,14 @@ buildPythonPackage rec { }) ]; + postPatch = '' + # https://github.com/horazont/aiosasl/issues/28 + substituteInPlace tests/test_aiosasl.py \ + --replace-fail "assertRaisesRegexp" "assertRaisesRegex" + ''; + + build-system = [ setuptools ]; + nativeCheckInputs = [ pyopenssl pytestCheckHook From dc0118692a7c47c24cb920f0c121bf8cf317775e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:01:31 +0200 Subject: [PATCH 253/311] swego: refactor --- pkgs/servers/swego/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 4e42ea33f97b..e2bf1056b030 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -1,7 +1,7 @@ -{ buildGoModule -, fetchFromGitHub -, lib +{ lib , stdenv +, buildGoModule +, fetchFromGitHub }: buildGoModule rec { @@ -11,8 +11,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; - rev = "v${version}"; - sha256 = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; + rev = "refs/tags/v${version}"; + hash = "sha256-O/wczHyaMev0CpAXoDxiN7TtHDsthG+jaH31SPMEB34="; }; vendorHash = "sha256-mJWJdwbZq042//hM3WWp2rnLC1GebckUnsIopbF858Q="; @@ -21,8 +21,13 @@ buildGoModule rec { mv $out/bin/src $out/bin/$pname ''; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { - description = "Simple Webserver in Golang"; + description = "Simple Webserver"; longDescription = '' Swiss army knife Webserver in Golang. Similar to the Python SimpleHTTPServer but with many features. From 51c39ac7acc44d4130041bad773c0e618400109a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:01:46 +0200 Subject: [PATCH 254/311] swego: format with nixfmt --- pkgs/servers/swego/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index e2bf1056b030..b8362d2d8675 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -1,7 +1,8 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { From 86f240d2a5327152b5b27fc61a76b2633eeb35ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Thu, 23 May 2024 11:03:07 +0200 Subject: [PATCH 255/311] r0vm: init at 0.21.0 --- pkgs/by-name/r0/r0vm/package.nix | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/r0/r0vm/package.nix diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix new file mode 100644 index 000000000000..caca6c16df07 --- /dev/null +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -0,0 +1,59 @@ +{ rustPlatform +, stdenv +, fetchFromGitHub +, fetchurl +, pkg-config +, perl +, openssl +, lib +, darwin +}: +rustPlatform.buildRustPackage rec { + pname = "r0vm"; + version = "0.21.0"; + src = fetchFromGitHub { + owner = "risc0"; + repo = "risc0"; + rev = "v${version}"; + sha256 = "sha256-BIQd6yX453v4w8aU+2awcngOE6t4oIf7BseVLgPG4Bw="; + }; + + buildAndTestSubdir = "risc0/r0vm"; + + nativeBuildInputs = [ + pkg-config + perl + ]; + + buildInputs = [ + openssl.dev + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + doCheck = false; + + cargoHash = "sha256-OsxCIFgJiHfx52nRYRNLTB501RGKSBPQs2MQAs/BFfc="; + + postPatch = + let + # see https://github.com/risc0/risc0/blob/v0.21.0/risc0/circuit/recursion/build.rs + sha256Hash = "3504a2542626acb974dea1ae5542c90c032c4ef42f230977f40f245442a1ec23"; + recursionZkr = fetchurl { + name = "recursion_zkr.zip"; + url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip"; + sha256 = "sha256:08zcl515890gyivhj8rgyi72q0qcr515bbm1vrsbkb164raa411m"; + }; + in + '' + ln -sf ${recursionZkr} ./risc0/circuit/recursion/src/recursion_zkr.zip + ''; + + meta = with lib; { + description = "RISC Zero zero-knowledge VM"; + homepage = "https://github.com/risc0/risc0"; + license = licenses.asl20; + maintainers = with maintainers; [ marijanp ]; + mainProgram = "r0vm"; + }; +} From 7c2e833237c200a999a012154bde9308e61783ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:06:26 +0200 Subject: [PATCH 256/311] metasploit: 6.4.9 -> 6.4.10 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 104 +++++++------ pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 160 +++++++++----------- 4 files changed, 129 insertions(+), 141 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index ae2b6975af12..e583a22e6a06 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.9" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.10" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index bfb943356101..4ea9806710a4 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: eac2a919309b9ec735cae13ceead0f4aa0e412e8 - ref: refs/tags/6.4.9 + revision: 19234871c7edcc534f2bd34505ec08a1f33319b0 + ref: refs/tags/6.4.10 specs: - metasploit-framework (6.4.9) + metasploit-framework (6.4.10) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -105,26 +105,26 @@ GIT GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + Ascii85 (1.1.1) + actionpack (7.0.8.3) + actionview (= 7.0.8.3) + activesupport (= 7.0.8.3) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.3) + activesupport (= 7.0.8.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) - activesupport (7.0.8.1) + activemodel (7.0.8.3) + activesupport (= 7.0.8.3) + activerecord (7.0.8.3) + activemodel (= 7.0.8.3) + activesupport (= 7.0.8.3) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -135,37 +135,37 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.3.0) - aws-partitions (1.916.0) - aws-sdk-core (3.192.1) + aws-partitions (1.933.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.450.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ec2 (1.457.1) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.38.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ec2instanceconnect (1.40.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.96.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-iam (1.98.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.79.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.82.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.147.0) - aws-sdk-core (~> 3, >= 3.192.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) - aws-sdk-ssm (1.166.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-ssm (1.169.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) - bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.7) + bcrypt_pbkdf (1.1.1) + bigdecimal (3.1.8) bindata (2.4.15) bootsnap (1.18.3) msgpack (~> 1.2) @@ -219,7 +219,7 @@ GEM domain_name (~> 0.5) http_parser.rb (0.8.0) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) irb (1.7.4) @@ -269,14 +269,14 @@ GEM metasploit_payloads-mettle (1.0.26) method_source (1.1.0) mini_portile2 (2.8.6) - minitest (5.22.3) + minitest (5.23.1) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.4.10) + net-imap (0.4.11) date net-protocol net-ldap (0.19.0) @@ -287,7 +287,7 @@ GEM net-ssh (7.2.3) network_interface (0.0.4) nexpose (7.3.0) - nio4r (2.7.1) + nio4r (2.7.3) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -302,7 +302,7 @@ GEM packetfu (2.0.0) pcaprub (~> 0.13.1) patch_finder (1.0.2) - pcaprub (0.13.1) + pcaprub (0.13.2) pdf-reader (2.12.0) Ascii85 (~> 1.0) afm (~> 0.2.1) @@ -313,7 +313,7 @@ GEM public_suffix (5.0.5) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-protection (3.2.0) base64 (>= 0.1.0) @@ -327,9 +327,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -341,7 +341,7 @@ GEM recog (3.1.5) nokogiri redcarpet (3.6.0) - reline (0.5.2) + reline (0.5.7) io-console (~> 0.5) rex-arch (0.1.15) rex-text @@ -351,7 +351,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.31) + rex-core (0.1.32) rex-encoder (0.1.7) metasm rex-arch @@ -374,7 +374,7 @@ GEM rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.11) + rex-random_identifier (0.1.12) rex-text rex-registry (0.1.5) rex-rop_builder (0.1.5) @@ -388,16 +388,17 @@ GEM rex-socket rex-text rex-struct2 (0.1.4) - rex-text (0.2.57) + rex-text (0.2.58) rex-zip (0.1.5) rex-text - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rkelly-remix (0.0.7) ruby-macho (4.0.1) ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.3.5) + ruby_smb (3.3.8) bindata (= 2.4.15) openssl-ccm openssl-cmac @@ -408,8 +409,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - simpleidn (0.2.1) - unf (~> 0.1.4) + simpleidn (0.2.3) sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) @@ -419,6 +419,7 @@ GEM mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) + strscan (3.1.0) swagger-blocks (3.0.0) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) @@ -433,9 +434,6 @@ GEM concurrent-ruby (~> 1.0) tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) unix-crypt (1.3.1) warden (1.2.9) rack (>= 2.0.9) @@ -459,7 +457,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.13) + zeitwerk (2.6.14) PLATFORMS ruby @@ -468,4 +466,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.9 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7779f954b619..76be725c6362 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.9"; + version = "6.4.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-0f7kpzeOY6EbFb7LRZc/J5lFYcf21HC6H6q0+qtTcao="; + hash = "sha256-RocCo0InffP2Dn0kZB4vEgct95dJbdDSxBND8UyuUGU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 901b70c29cc2..a60daf4c5e82 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "11c5pm65m46wlqd25glmwpkji1jn1v2n918jmklxp4w9rr43dzi6"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "0p0w1rl3f5k7m39j9gnyw5wqz6ym18bhcacisqq4zng2k6jf4893"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "0y8w73rdd7x1m1gwswjhpqfbjr95hh7hcnkjqk1wz8x9gjk9njb6"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "03pqj57md528dgwwplr234hq628allla71i1pxys2inbpp7s7vn8"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "1ybapgiiysxgcjyzifn34ksbwjdjzslbvbcd7v83wiry1qmiyg93"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; addressable = { groups = ["default"]; @@ -84,10 +84,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw"; + sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; aws-eventstream = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gilrh9fb1576xm2ah0l6d33qkiabz55zpq004qqia9xavl43ylz"; + sha256 = "1axv3iicp4as5dxhmwrxf3rc7389ba94gk11yilw3vwv4hch87yx"; type = "gem"; }; - version = "1.916.0"; + version = "1.933.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp8rxk9wl3kmb7xabcz5hbcv7kzsvsx0wyib2fsg9d42kz149n0"; + sha256 = "0f44kp3g9g8v60f7xw769r734b7w6n774jj2njn42444ip3zwsz3"; type = "gem"; }; - version = "3.192.1"; + version = "3.196.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101jjqf912jwca119v86i4inlkf2gldmmhgdm2rdk5hqrwl4yrf4"; + sha256 = "114xd77sb1wzxv1ys2dg7adzyfbfzy3k2x885slgbdwh6q9nby0f"; type = "gem"; }; - version = "1.450.0"; + version = "1.457.1"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mhqk2s8klp8djibrhgmh9lz9nr4rh1yy7y6c86if55r07i1912c"; + sha256 = "1sjjyp90hhgbxmiw9sdscyfgjpy86m10dbr1dmxw3dmq244p3ilq"; type = "gem"; }; - version = "1.38.0"; + version = "1.40.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcvkal9ahwr84pz1cb3y9ylx3f74m4kgs4n160dfzf51b8m917l"; + sha256 = "0a2kir61jwjpwwk5nld3daxkbc38ivszrxyjs9v320cq6hk6g80v"; type = "gem"; }; - version = "1.96.0"; + version = "1.98.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cb0006xf5isq5drdwkvd6xz20886x3rzcj5qyly7g8gql5lc8aw"; + sha256 = "0j6wlmn9h8l571ll7pamqxk5b3mg5ms65b85w0r1qjs3v1i5xfcd"; type = "gem"; }; - version = "1.79.0"; + version = "1.82.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ibw2v56k8v2sw92cyliprq1xxfyavnd60yl6ach3f4qbp156xrn"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.147.0"; + version = "1.151.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0drad0zka0kjayiy971vcl5dfp6j37wgga4xncya8w8xsrknh9s8"; + sha256 = "1liyqnj8hjyrix96kbbqflr4bh3hg07jjcx5x6bsiiqsixblq4md"; type = "gem"; }; - version = "1.166.0"; + version = "1.169.0"; }; aws-sigv4 = { groups = ["default"]; @@ -214,20 +214,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; + sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; bindata = { groups = ["default"]; @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; io-console = { groups = ["default"]; @@ -674,12 +674,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "eac2a919309b9ec735cae13ceead0f4aa0e412e8"; - sha256 = "1akiafmzmd5a3yx71m7nqxhlb6977yblbjxy2lds2qwf6yky9zni"; + rev = "19234871c7edcc534f2bd34505ec08a1f33319b0"; + sha256 = "0rahmr6g2hqkqk9d0va9jzvjs1qj5wg6893x1vvg6z978aih51s6"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.9"; + version = "6.4.10"; }; metasploit-model = { groups = ["default"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; type = "gem"; }; - version = "5.22.3"; + version = "5.23.1"; }; mqtt = { groups = ["default"]; @@ -806,10 +806,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; + sha256 = "1y0pzapcasfjayk4nydy04hnx11xmsv8jl8myizxhbpkdmrl10dc"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; net-ldap = { groups = ["default"]; @@ -876,10 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15iwbiij52x6jhdbl0rkcldnhfndmsy0sbnsygkr9vhskfqrp72m"; + sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -967,10 +967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0886fcc5bi0kc0rbma5fj3wa3hbg2nl7ivnbi2j995yzg36zq7xy"; + sha256 = "0bwhm5b7f0ncazffxzlyql83khcgydx2ncav9k241gab4knkhb7l"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.2"; }; pdf-reader = { groups = ["default"]; @@ -1017,10 +1017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rack = { groups = ["default"]; @@ -1077,10 +1077,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "0sxki005rl1315mp78csayvfdx5zxjvwv8xmcfyjksgq27cimk5r"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.3"; }; rake = { groups = ["default"]; @@ -1137,10 +1137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xwf7i2kvgaxbpdqqkncv9dpfhlj55shig4sdzgy7kgbfj09mm03"; + sha256 = "06rlp3wjcbwbgw3xlawclzzmj6ryn6ap65nh54x5yzgx0c3jlqqz"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.7"; }; rex-arch = { groups = ["default"]; @@ -1167,10 +1167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5fz1fipk2x9grd8rj7n09wfmq78kdhw9fvrmgr9z52zi640xzs"; + sha256 = "0468gxcwhzp5y7lahkf0cg4vyy01wb2fk6w1rx4fgh1l9330a64b"; type = "gem"; }; - version = "0.1.31"; + version = "0.1.32"; }; rex-encoder = { groups = ["default"]; @@ -1247,10 +1247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc05f0xvradyp50vz8s1h9lzgh9c31nz8yq7r22bph03v71f0c"; + sha256 = "02709z33zcbq2i3ca66b94n3aqbd8r6ib1dgb2fby1vk5nrg18p9"; type = "gem"; }; - version = "0.1.11"; + version = "0.1.12"; }; rex-registry = { groups = ["default"]; @@ -1307,10 +1307,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08wrqy8sgncsn6kcplw7bl6c2bmyj9fza7x77wrlwh1gza7pcjk4"; + sha256 = "04icj61kn5bnd939km6y49ylv8sbkqb96jld91nbrijahawcf5yz"; type = "gem"; }; - version = "0.2.57"; + version = "0.2.58"; }; rex-zip = { groups = ["default"]; @@ -1327,10 +1327,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0d8ivcirrrxpkpjc1c835wknc9s2fl54xpw08s177yfrh5ish209"; type = "gem"; }; - version = "3.2.6"; + version = "3.2.8"; }; rkelly-remix = { groups = ["default"]; @@ -1387,10 +1387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fwk5hqaph37apa5zf1mg2n2wd5lkz3sgwl0f4ndhkv1vfxbb2ys"; + sha256 = "1hw3hj2q0xkqr90snzrpiqfa7lsc5k4w6bgdj624vxkh7q0nnfw7"; type = "gem"; }; - version = "3.3.5"; + version = "3.3.8"; }; rubyntlm = { groups = ["default"]; @@ -1427,10 +1427,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m"; + sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.3"; }; sinatra = { groups = ["default"]; @@ -1472,6 +1472,16 @@ }; version = "0.2.5"; }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; swagger-blocks = { groups = ["default"]; platforms = []; @@ -1552,26 +1562,6 @@ }; version = "1.2024.1"; }; - unf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; - type = "gem"; - }; - version = "0.0.9.1"; - }; unix-crypt = { groups = ["default"]; platforms = []; @@ -1677,9 +1667,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; + sha256 = "0ayraiqfhhjzpyr4yxp035002lq78ip1zhr0ix87rn3rqpnsrn3h"; type = "gem"; }; - version = "2.6.13"; + version = "2.6.14"; }; } From c4bfea54cad62dcb50741caa609dd06d0d584802 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:13:05 +0200 Subject: [PATCH 257/311] python311Packages.aioxmpp: refactor --- .../python-modules/aioxmpp/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index 1608a234e721..bb101d56d918 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -1,27 +1,31 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - aiosasl, aioopenssl, + aiosasl, babel, + buildPythonPackage, dnspython, + fetchFromGitHub, lxml, multidict, - pyasn1, pyasn1-modules, + pyasn1, pyopenssl, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, pytz, + setuptools, sortedcollections, tzlocal, - pytestCheckHook, }: buildPythonPackage rec { pname = "aioxmpp"; version = "0.13.3"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "horazont"; @@ -30,7 +34,15 @@ buildPythonPackage rec { hash = "sha256-bQPKEM5eKhFI3Kx3U1espdxqjnG4yUgOXmYCrd98PDo="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "lxml" + ]; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ aiosasl aioopenssl babel @@ -63,9 +75,9 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; description = "Pure-python XMPP library for asyncio"; homepage = "https://github.com/horazont/aioxmpp"; + changelog = "https://github.com/horazont/aioxmpp/blob/${src.rev}/docs/api/changelog.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; From 79cba4fa1985e287bf63eca4a8d9632d159d29af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 12:19:34 +0200 Subject: [PATCH 258/311] python312Packages.aioxmpp: disable failing tests on Python 3.12 Upstream is archived --- pkgs/development/python-modules/aioxmpp/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/aioxmpp/default.nix b/pkgs/development/python-modules/aioxmpp/default.nix index bb101d56d918..9e770ae06522 100644 --- a/pkgs/development/python-modules/aioxmpp/default.nix +++ b/pkgs/development/python-modules/aioxmpp/default.nix @@ -12,6 +12,7 @@ pyasn1, pyopenssl, pytestCheckHook, + pythonAtLeast, pythonOlder, pythonRelaxDepsHook, pytz, @@ -72,6 +73,17 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'zoneinfo.ZoneInfo' object has no attribute 'normalize' "test_convert_field_datetime_default_locale" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # asyncio issues + "test_is_abstract" + "Testbackground" + "TestCapturingXSO" + "Testcheck_x509" + "TestClient" + "TestIntegerType" + "TestStanzaStream" + "TestStanzaToken" + "TestXMLStream" ]; meta = { From 3328b40f27fe1dd9ca7e367970fa01adf8d346e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 10:39:21 +0000 Subject: [PATCH 259/311] autotiling: 1.9.2 -> 1.9.3 --- pkgs/misc/autotiling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index 13b834dcbda4..41131cbb916b 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u+Tvvge/rQvylbZDmCxvoMGjZm2gKsFZEAb9evR/Ckw="; + hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; From 2db20f930c231c6e0ef4f340bfef30ff1fe7cfed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 10:43:05 +0000 Subject: [PATCH 260/311] python311Packages.pyenvisalink: 4.6 -> 4.7 --- pkgs/development/python-modules/pyenvisalink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index 54195b8eba57..84167f4ae58d 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.6"; + version = "4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CQvomHYNMrf0oQjNCcLyisxIV2+3TOgEPzA9seZYsOs="; + hash = "sha256-b5v/7+B/yyCnKrWCs0scAuIgV1wSLk6cVa57n+HncUw="; }; propagatedBuildInputs = [ From 6360b911311ea656d40fa6eba22e5e31c43ad990 Mon Sep 17 00:00:00 2001 From: Dhananjay Balan Date: Tue, 21 May 2024 14:56:27 +0200 Subject: [PATCH 261/311] awslogs: 0.14.0 -> 0.15.0 --- pkgs/tools/admin/awslogs/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 153da049ac16..87285da59492 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "awslogs"; - version = "0.14.0"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; src = fetchFromGitHub { owner = "jorgebastida"; repo = pname; rev = version; - sha256 = "sha256-DrW8s0omQqLp1gaoR6k/YR11afRjUbGYrFtfYhby2b8="; + sha256 = "sha256-o6xZqwlqAy01P+TZ0rB5rpEddWNUBzzHp7/cycpcwes="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -24,19 +24,14 @@ python3.pkgs.buildPythonApplication rec { jmespath ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; postPatch = '' substituteInPlace setup.py \ - --replace "jmespath>=0.7.1,<1.0.0" "jmespath>=0.7.1" \ - --replace '>=3.5.*' '>=3.5' + --replace "boto3>=1.34.75" "boto3>=1.34.58" \ ''; - disabledTests = [ - "test_main_get_query" - "test_main_get_with_color" + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook ]; pythonImportsCheck = [ From e69199ed303799ab67b9065860066d7bb2f0ebe3 Mon Sep 17 00:00:00 2001 From: daru Date: Thu, 23 May 2024 13:01:44 +0200 Subject: [PATCH 262/311] hmcl: 3.5.7 -> 3.5.8 --- pkgs/games/hmcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 9426b611f3a6..2ff06a19219d 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -18,7 +18,7 @@ }: let - version = "3.5.7"; + version = "3.5.8"; icon = fetchurl { url = "https://github.com/huanghongxun/HMCL/raw/release-${version}/HMCLauncher/HMCL/HMCL.ico"; hash = "sha256-+EYL33VAzKHOMp9iXoJaSGZfv+ymDDYIx6i/1o47Dmc="; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/huanghongxun/HMCL/releases/download/release-${version}/HMCL-${version}.jar"; - hash = "sha256-ziqcauetWoFn58kBJ0KnqX5CPNC/Sn7DD/Buxdi977I="; + hash = "sha256-HRTXJhKtRB+pANMAZ9R1kNsSbl/Rr6a8wMhfaPeD/40="; }; dontUnpack = true; From fd374e94e971ed243840c4425fd715e67eb8561c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 13:09:39 +0200 Subject: [PATCH 263/311] python311Packages.python-ironicclient: fix dependencies after #310075 --- .../python-modules/python-ironicclient/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 703be62e3051..5fc6e9365ad7 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pbr, - appdirs, cliff, dogpile-cache, jsonschema, @@ -11,12 +9,14 @@ openstacksdk, osc-lib, oslo-utils, + oslotest, + pbr, + platformdirs, pyyaml, requests, - stevedore, - stestr, requests-mock, - oslotest, + stestr, + stevedore, }: buildPythonPackage rec { @@ -30,8 +30,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pbr - appdirs cliff dogpile-cache jsonschema @@ -39,6 +37,8 @@ buildPythonPackage rec { openstacksdk osc-lib oslo-utils + pbr + platformdirs pyyaml requests stevedore From d20a86ccc104e906c057019e69fca4416ecb0258 Mon Sep 17 00:00:00 2001 From: Yohann Boniface Date: Thu, 23 May 2024 13:43:35 +0200 Subject: [PATCH 264/311] pkgs/development/libraries: remove unused fetchpatch and other arguments (#313402) --- pkgs/development/libraries/abseil-cpp/202111.nix | 1 - pkgs/development/libraries/allegro/5.nix | 1 - pkgs/development/libraries/apr/default.nix | 2 +- pkgs/development/libraries/boost/1.75.nix | 2 +- pkgs/development/libraries/boost/1.77.nix | 2 +- pkgs/development/libraries/boost/1.78.nix | 2 +- pkgs/development/libraries/boost/1.79.nix | 2 +- pkgs/development/libraries/boost/1.80.nix | 2 +- pkgs/development/libraries/boost/1.81.nix | 2 +- pkgs/development/libraries/boost/1.82.nix | 2 +- pkgs/development/libraries/boost/1.83.nix | 2 +- pkgs/development/libraries/boost/1.84.nix | 2 +- pkgs/development/libraries/boost/1.85.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/cereal/1.3.2.nix | 1 - pkgs/development/libraries/ceres-solver/default.nix | 1 - pkgs/development/libraries/cmocka/default.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 1 - pkgs/development/libraries/crocoddyl/default.nix | 1 - pkgs/development/libraries/drogon/default.nix | 2 +- pkgs/development/libraries/duckdb/default.nix | 2 -- pkgs/development/libraries/egl-wayland/default.nix | 1 - pkgs/development/libraries/exiv2/default.nix | 1 - pkgs/development/libraries/fcgi/default.nix | 2 +- pkgs/development/libraries/fcl/default.nix | 2 +- pkgs/development/libraries/fmt/default.nix | 2 +- pkgs/development/libraries/fox/default.nix | 1 - pkgs/development/libraries/fuzzylite/default.nix | 1 - pkgs/development/libraries/geoclue/default.nix | 1 - pkgs/development/libraries/giflib/default.nix | 1 - pkgs/development/libraries/globalarrays/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 1 - pkgs/development/libraries/hpp-fcl/default.nix | 1 - pkgs/development/libraries/kde-frameworks/baloo.nix | 1 - .../libraries/kde-frameworks/knewstuff/default.nix | 2 +- pkgs/development/libraries/kde-frameworks/krunner.nix | 2 +- pkgs/development/libraries/kde-frameworks/purpose.nix | 2 +- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/development/libraries/libbluray/default.nix | 2 +- pkgs/development/libraries/libcdr/default.nix | 2 +- pkgs/development/libraries/libdigidocpp/default.nix | 2 +- pkgs/development/libraries/libevdev/default.nix | 2 +- pkgs/development/libraries/libewf/default.nix | 2 +- pkgs/development/libraries/libffi/3.3.nix | 3 +-- pkgs/development/libraries/libffi/default.nix | 3 +-- pkgs/development/libraries/libgdiplus/default.nix | 2 +- pkgs/development/libraries/libmd/default.nix | 2 +- pkgs/development/libraries/libopenshot-audio/default.nix | 1 - pkgs/development/libraries/libopus/default.nix | 1 - pkgs/development/libraries/libraspberrypi/default.nix | 1 - pkgs/development/libraries/libschrift/default.nix | 2 +- pkgs/development/libraries/libunwind/default.nix | 2 +- pkgs/development/libraries/libusb1/default.nix | 1 - pkgs/development/libraries/libvncserver/default.nix | 1 - pkgs/development/libraries/malcontent/default.nix | 1 - pkgs/development/libraries/mediastreamer/msopenh264.nix | 1 - pkgs/development/libraries/minizip-ng/default.nix | 1 - pkgs/development/libraries/minizip/default.nix | 2 +- pkgs/development/libraries/monocypher/default.nix | 2 +- pkgs/development/libraries/mtxclient/default.nix | 1 - pkgs/development/libraries/opencascade-occt/default.nix | 1 - pkgs/development/libraries/opencv/3.x.nix | 1 - pkgs/development/libraries/physics/geant4/default.nix | 2 +- pkgs/development/libraries/physics/rivet/default.nix | 2 +- pkgs/development/libraries/proj/default.nix | 1 - pkgs/development/libraries/python-qt/default.nix | 1 - pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 +- pkgs/development/libraries/range-v3/default.nix | 2 +- pkgs/development/libraries/rocksdb/default.nix | 1 - .../libraries/science/math/libamplsolver/default.nix | 2 +- .../libraries/science/math/zn_poly/default.nix | 1 - pkgs/development/libraries/spandsp/3.nix | 9 +-------- pkgs/development/libraries/spandsp/default.nix | 9 +-------- pkgs/development/libraries/tk/8.6.nix | 1 - pkgs/development/libraries/umockdev/default.nix | 1 - pkgs/development/libraries/zziplib/default.nix | 1 - 76 files changed, 42 insertions(+), 93 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index 0c1a173eca44..076d1e850483 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , static ? stdenv.hostPlatform.isStatic , cxxStandard ? null diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index eaf227fa60d1..ac9704b617e9 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -3,7 +3,6 @@ , cmake , enet , fetchFromGitHub -, fetchpatch , flac , freetype , gtk3 diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 6428489173da..dfa97d200e91 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: +{ lib, stdenv, fetchurl, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix index ec77070c932c..c8971119c992 100644 --- a/pkgs/development/libraries/boost/1.75.nix +++ b/pkgs/development/libraries/boost/1.75.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.75.0"; diff --git a/pkgs/development/libraries/boost/1.77.nix b/pkgs/development/libraries/boost/1.77.nix index 3da1a455ead4..72663044d9c9 100644 --- a/pkgs/development/libraries/boost/1.77.nix +++ b/pkgs/development/libraries/boost/1.77.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.77.0"; diff --git a/pkgs/development/libraries/boost/1.78.nix b/pkgs/development/libraries/boost/1.78.nix index 2cc818e63ce0..53a3f300a792 100644 --- a/pkgs/development/libraries/boost/1.78.nix +++ b/pkgs/development/libraries/boost/1.78.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.78.0"; diff --git a/pkgs/development/libraries/boost/1.79.nix b/pkgs/development/libraries/boost/1.79.nix index 87975e2846d3..91e13edf2265 100644 --- a/pkgs/development/libraries/boost/1.79.nix +++ b/pkgs/development/libraries/boost/1.79.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.79.0"; diff --git a/pkgs/development/libraries/boost/1.80.nix b/pkgs/development/libraries/boost/1.80.nix index 1aab51af78a7..79281cd1c70a 100644 --- a/pkgs/development/libraries/boost/1.80.nix +++ b/pkgs/development/libraries/boost/1.80.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.80.0"; diff --git a/pkgs/development/libraries/boost/1.81.nix b/pkgs/development/libraries/boost/1.81.nix index 2376255303e2..3d8474f1df6a 100644 --- a/pkgs/development/libraries/boost/1.81.nix +++ b/pkgs/development/libraries/boost/1.81.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.81.0"; diff --git a/pkgs/development/libraries/boost/1.82.nix b/pkgs/development/libraries/boost/1.82.nix index 193d07ef7562..cf3a7fe3734c 100644 --- a/pkgs/development/libraries/boost/1.82.nix +++ b/pkgs/development/libraries/boost/1.82.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.82.0"; diff --git a/pkgs/development/libraries/boost/1.83.nix b/pkgs/development/libraries/boost/1.83.nix index df5c5a5bbd31..446c759d335f 100644 --- a/pkgs/development/libraries/boost/1.83.nix +++ b/pkgs/development/libraries/boost/1.83.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.83.0"; diff --git a/pkgs/development/libraries/boost/1.84.nix b/pkgs/development/libraries/boost/1.84.nix index a55f55afaae0..bfcfdfbfd7cf 100644 --- a/pkgs/development/libraries/boost/1.84.nix +++ b/pkgs/development/libraries/boost/1.84.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.84.0"; diff --git a/pkgs/development/libraries/boost/1.85.nix b/pkgs/development/libraries/boost/1.85.nix index 2a3252d38c57..a95789800e1b 100644 --- a/pkgs/development/libraries/boost/1.85.nix +++ b/pkgs/development/libraries/boost/1.85.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, ... } @ args: +{ callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { version = "1.85.0"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7408a43272e9..e2483bb141a5 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +{ lib, stdenv, fetchurl, gtk-doc, meson, ninja, pkg-config, python3 , docbook_xsl, fontconfig, freetype, libpng, pixman, zlib , x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib diff --git a/pkgs/development/libraries/cereal/1.3.2.nix b/pkgs/development/libraries/cereal/1.3.2.nix index 5a44b26426c7..0005df881844 100644 --- a/pkgs/development/libraries/cereal/1.3.2.nix +++ b/pkgs/development/libraries/cereal/1.3.2.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake }: diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 7052c98d8ef8..da5afde02627 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , blas , cmake diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 6c88d1baebfa..9a7ea037785b 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, cmake }: +{ fetchurl, lib, stdenv, cmake }: stdenv.mkDerivation rec { pname = "cmocka"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 987d90e26995..93f75767697f 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , libGL , glib diff --git a/pkgs/development/libraries/crocoddyl/default.nix b/pkgs/development/libraries/crocoddyl/default.nix index efba13612298..d9bb52f617ac 100644 --- a/pkgs/development/libraries/crocoddyl/default.nix +++ b/pkgs/development/libraries/crocoddyl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , example-robot-data , pinocchio diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 2cdc6cfafb36..1710d6046e33 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib # optional but of negligible size , openssl, brotli, c-ares # optional databases diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 343574f251a8..c222b117fff9 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, substituteAll , cmake , ninja , openssl diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index f84b44007e29..626cd52df7a8 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , eglexternalplatform , pkg-config , meson diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 0ef833b8aa23..5880ea1feed5 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , gettext diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 5c7f0c44f91c..5b87be3b1a63 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/development/libraries/fcl/default.nix index 4e13a3f7113f..0c6790db9f70 100644 --- a/pkgs/development/libraries/fcl/default.nix +++ b/pkgs/development/libraries/fcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, eigen, libccd, octomap }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, libccd, octomap }: stdenv.mkDerivation rec { pname = "fcl"; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 4dd6d86fdaeb..9ce329df7957 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub, fetchpatch +, fetchFromGitHub , cmake , enableShared ? !stdenv.hostPlatform.isStatic diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 49526b99c53b..2715e2c80ca4 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , libpng , libjpeg , libtiff diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/development/libraries/fuzzylite/default.nix index 1fd6d6506c28..6f07d6a03427 100644 --- a/pkgs/development/libraries/fuzzylite/default.nix +++ b/pkgs/development/libraries/fuzzylite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , useFloat ? false diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index df58e5dc9e19..3c6a40eeb5cb 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , intltool , meson , mesonEmulatorHook diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 677db06e5083..5e60b3d9a57b 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , fixDarwinDylibNames , pkgsStatic }: diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index f7bc072f1757..ee7876e548d4 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, autoreconfHook +{ lib, stdenv, fetchFromGitHub, autoreconfHook , blas, gfortran, openssh, mpi } : diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index aba944becf76..31bed4c108b4 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 59bf04f72609..64a4d0883236 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doxygen , boost diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 2a264d47c24c..c7a813058454 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , extra-cmake-modules , kauth , kconfig diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 6e554b5faaad..0e1633b2f1c1 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index a56e56a2fe09..1ed8619a2fa2 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,5 @@ { - mkDerivation, fetchpatch, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index ee4e9584641c..cdc8d4d32d23 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, intltool, qtbase , accounts-qt, qtdeclarative, kaccounts-integration, kconfig, kcoreaddons, ki18n, kio, kirigami2 -, fetchpatch, signond +, signond }: mkDerivation { diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index ce570b76bc08..158493b80e90 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 552259ce3bab..f50172851d61 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration +{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk17, ant, stripJavaArchivesHook , withAACS ? false, libaacs , withBDplus ? false, libbdplus diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 64695aaa55d7..bf08acf00128 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: +{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { pname = "libcdr"; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 7f706a220afc..d957d2d05d0d 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index c8db600dce81..34af29955abb 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3 }: +{ lib, stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index dffacc7d276c..6c149b0186ee 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: +{ fetchurl, lib, stdenv, zlib, openssl, libuuid, pkg-config, bzip2 }: stdenv.mkDerivation rec { version = "20231119"; diff --git a/pkgs/development/libraries/libffi/3.3.nix b/pkgs/development/libraries/libffi/3.3.nix index 294717d1fb1c..76d1113eae19 100644 --- a/pkgs/development/libraries/libffi/3.3.nix +++ b/pkgs/development/libraries/libffi/3.3.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl , doCheck ? true # test suite depends on dejagnu which cannot be used during bootstrapping , dejagnu diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index edd16ec21506..6028cf3f736d 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook +{ lib, stdenv, fetchurl # test suite depends on dejagnu which cannot be used during bootstrapping # dejagnu also requires tcl which can't be built statically at the moment diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index e71aedd2cbcf..4d315b042ee9 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng -, libXrender, libexif, autoreconfHook, fetchpatch }: +, libXrender, libexif, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libgdiplus"; diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index bf156fb1c55d..867bd5dc9ba3 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation (finalAttrs: { pname = "libmd"; diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index bbec90a4055a..005422295236 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , cmake , doxygen diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index d247b8b0efa6..a841d1cfa903 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , gitUpdater , meson diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 14f02d8481e9..bb7508b1cec5 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config }: diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 443550e8a0a1..c1a7e1bc7703 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libschrift"; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 5144abc6dc5b..d13cc33fae31 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, xz, buildPackages }: stdenv.mkDerivation rec { pname = "libunwind"; diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9114fe5ec47f..bd8561e0e8a3 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , doxygen , pkg-config diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 4880c835a1eb..84e0dba1dd25 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , libjpeg , openssl diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index f346906eadc2..2f4044aaed34 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 83a96175cba5..353dcd4aafdf 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,7 +1,6 @@ { autoreconfHook , cmake , fetchFromGitLab -, fetchpatch , mediastreamer , openh264 , pkg-config diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 5be1f2e51925..baf6a4f687a4 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , gtest , pkg-config diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 586dd113f1d1..44cba9767b36 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: +{ lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { pname = "minizip"; diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix index b37cfffabc0e..f5853385ba91 100644 --- a/pkgs/development/libraries/monocypher/default.nix +++ b/pkgs/development/libraries/monocypher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "monocypher"; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 13816faefce9..1c589f1af6d5 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , coeurl diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix index 664968de6432..a09cacaf3928 100644 --- a/pkgs/development/libraries/opencascade-occt/default.nix +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , cmake , ninja , tcl diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 5e9409368cc7..140eee9c06e8 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf_21 diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 9dcaea8be041..ded942cca26f 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -9,7 +9,7 @@ , enableRaytracerX11 ? false # Standard build environment with cmake. -, lib, stdenv, fetchurl, fetchpatch, cmake +, lib, stdenv, fetchurl, cmake , clhep , expat diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index a59b34147a9f..24bc62820194 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texliveBasic, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index daab5ac2a566..0a0ae87dc628 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , buildPackages diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2b7ac684974e..404aa4921c4e 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, python3, qmake, qtwebengine, diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 44007bec07b8..0194d3b43902 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -24,7 +24,7 @@ , MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML, OpenDirectory, Accelerate , cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_4 ? null -, lib, stdenv, fetchpatch +, lib, stdenv , version ? null , qtCompatVersion , pipewireSupport ? stdenv.isLinux diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 77db5869f62a..9b9c2bd39d64 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "range-v3"; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c584ef2976d1..f07a43cfbec0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , ninja , bzip2 diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index a40091bac8b5..cbcc9ce766db 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substitute, fetchurl, fetchpatch }: +{ lib, stdenv, substitute, fetchurl }: stdenv.mkDerivation rec { pname = "libamplsolver"; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index bdaf6e6284ef..1c61bb07471b 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gmp , python3 , tune ? false # tune to hardware, impure diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix index 9e916273809f..772388405c49 100644 --- a/pkgs/development/libraries/spandsp/3.nix +++ b/pkgs/development/libraries/spandsp/3.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchFromGitHub -, audiofile -, libtiff -, autoreconfHook -, fetchpatch -, buildPackages +{ fetchFromGitHub , callPackage }: diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index cf5e53c3f911..38e250ddef90 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,11 +1,4 @@ -{ lib -, stdenv -, fetchurl -, audiofile -, libtiff -, buildPackages -, fetchpatch -, autoreconfHook +{ fetchurl , callPackage }: diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index fbf456051754..c5317a8545dd 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -2,7 +2,6 @@ , stdenv , callPackage , fetchurl -, fetchpatch , tcl , ... } @ args: diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 2d543f5a5364..6576377e549f 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -2,7 +2,6 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index c40cf9594cfa..cae01170f290 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , perl , pkg-config From 97e008283acb1e5bbcccc8187c3d18cb8eaed8ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 May 2024 13:49:28 +0200 Subject: [PATCH 265/311] level-zero: 1.16.15 -> 1.17.2, add key packages to passthru.tests Diff: https://github.com/oneapi-src/level-zero/compare/refs/tags/v1.16.15...v1.17.2 Changelog: https://github.com/oneapi-src/level-zero/blob/v1.17.2/CHANGELOG.md --- pkgs/development/libraries/level-zero/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index a098a0ea5b6b..c59822a32308 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -3,6 +3,8 @@ , cmake , fetchFromGitHub , fmt_9 +, intel-compute-runtime +, openvino , spdlog , stdenv , substituteAll @@ -10,13 +12,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.16.15"; + version = "1.17.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-J+XIqaV1ThD0RqqcyIkzvTWCkIztjkHzGzUbj0qojJs="; + hash = "sha256-ha/xpp+scLau+cTIyixwo8TgAJrb2DVboGDPWibxb08="; }; patches = [ @@ -34,6 +36,10 @@ stdenv.mkDerivation rec { addOpenGLRunpath $out/lib/libze_loader.so ''; + passthru.tests = { + inherit intel-compute-runtime openvino; + }; + meta = with lib; { description = "oneAPI Level Zero Specification Headers and Loader"; homepage = "https://github.com/oneapi-src/level-zero"; From 56141e2236e2607f3e54858a9617b2eb8b4adee8 Mon Sep 17 00:00:00 2001 From: Isabelle Date: Thu, 23 May 2024 13:53:45 +0200 Subject: [PATCH 266/311] nixos/wireguard: add option preShutdown for commands called before interface deletion (#310345) --- nixos/modules/services/networking/wireguard.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 3f68af3a86c9..81abae2c9303 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -80,6 +80,15 @@ let description = "Commands called at the end of the interface setup."; }; + preShutdown = mkOption { + example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns del foo"''; + default = ""; + type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; + description = '' + Commands called before shutting down the interface. + ''; + }; + postShutdown = mkOption { example = literalExpression ''"''${pkgs.openresolv}/bin/resolvconf -d wg0"''; default = ""; @@ -497,6 +506,7 @@ let ''; postStop = '' + ${values.preShutdown} ${ipPostMove} link del dev "${name}" ${values.postShutdown} ''; From a5a479363d84c9dd9fdaa66347e17b95e6f22799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 22 May 2024 22:17:17 +0200 Subject: [PATCH 267/311] amber-lang: init at 0.3.1-alpha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/am/amber-lang/package.nix | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/am/amber-lang/package.nix diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix new file mode 100644 index 000000000000..a12302748405 --- /dev/null +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -0,0 +1,49 @@ +{ lib, + fetchFromGitHub, + rustPlatform, + bc, + makeWrapper, + runCommand, + amber-lang +}: + +rustPlatform.buildRustPackage rec { + pname = "amber-lang"; + version = "0.3.1-alpha"; + + src = fetchFromGitHub { + owner = "Ph0enixKM"; + repo = "Amber"; + rev = version; + hash = "sha256-VSlLPgoi+KPnUQJEb6m0VZQVs1zkxEnfqs3fAp8m1o4="; + }; + + cargoHash = "sha256-NzcyX/1yeFcI80pNxx/OTkaI82qyQFJW8U0vPbqSU7g="; + + buildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ bc ]; + + preConfigure = '' + substituteInPlace src/compiler.rs \ + --replace-fail "/bin/bash" "bash" + ''; + + postInstall = '' + wrapProgram "$out/bin/amber" --prefix PATH : "${lib.makeBinPath [bc]}" + ''; + + passthru.tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' + diff -U3 --color=auto <(amber -e 'echo "Hello, World"') <(echo 'Hello, World') + touch $out + ''; + + meta = with lib; { + description = "Programming language compiled to bash"; + homepage = "https://amber-lang.com"; + license = licenses.gpl3Plus; + mainProgram = "amber"; + maintainers = with maintainers; [ cafkafk uncenter ]; + platforms = platforms.unix; + }; +} From 66ff0e159d05ea5a1533c8485bb4024e1790fad2 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 20 May 2024 15:55:42 +0800 Subject: [PATCH 268/311] vimPlugins.nvim-snippets: init at 2024-02-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d6089e70b84d..d3fee498e51f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8221,6 +8221,18 @@ final: prev: meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; + nvim-snippets = buildVimPlugin { + pname = "nvim-snippets"; + version = "2024-02-07"; + src = fetchFromGitHub { + owner = "garymjr"; + repo = "nvim-snippets"; + rev = "f394d17b9a83820714957a06c6ed8e12223f3034"; + sha256 = "10yfjdjygxlagvf6pvj6n86n0kzf7j72zf7sq9mvy42a9h68i3ip"; + }; + meta.homepage = "https://github.com/garymjr/nvim-snippets/"; + }; + nvim-solarized-lua = buildVimPlugin { pname = "nvim-solarized-lua"; version = "2024-03-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7637b8d34ef2..e7bea0cdcd8c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -692,6 +692,7 @@ https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, https://github.com/dcampos/nvim-snippy/,HEAD, +https://github.com/garymjr/nvim-snippets/,, https://github.com/ishan9299/nvim-solarized-lua/,, https://github.com/lucidph3nx/nvim-sops/,HEAD, https://github.com/nvim-pack/nvim-spectre/,, From eb042e727abff5ea1c192c47cdddc8e5c823b5fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 12:14:38 +0000 Subject: [PATCH 269/311] python311Packages.manifestoo-core: 1.5 -> 1.6 --- pkgs/development/python-modules/manifestoo-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index ce3cd3a6ef28..3b74218301a3 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "manifestoo-core"; - version = "1.5"; + version = "1.6"; format = "pyproject"; src = fetchPypi { inherit version; pname = "manifestoo_core"; - hash = "sha256-a3v2WfJ42bh2LlAsH9ekpLFsAlOiTTLGNknTW2mTxCI="; + hash = "sha256-gOWu01Z1lxhMJELyxvU5A5AskVEqCoLV/auydM5/QCE="; }; nativeBuildInputs = [ hatch-vcs ]; From 84020441635dd16ecd5b06a23f5d57949c1358ad Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 May 2024 15:28:28 +0300 Subject: [PATCH 270/311] python311Packages.pyside6: fix build with Qt 6.7.1 Fixes #313908 --- .../python-modules/pyside6/default.nix | 6 ++ .../python-modules/pyside6/qt-6.7.1.patch | 87 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 pkgs/development/python-modules/pyside6/qt-6.7.1.patch diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 5f5285cccfb2..0144c91bd3e9 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { inherit (shiboken6) version src; + patches = [ + # stripped down version of https://github.com/pyside/pyside-setup/commit/a0d68856d67ce6e178e3cfc2fccc236707e02fcd + # FIXME: remove in next release + ./qt-6.7.1.patch + ]; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS diff --git a/pkgs/development/python-modules/pyside6/qt-6.7.1.patch b/pkgs/development/python-modules/pyside6/qt-6.7.1.patch new file mode 100644 index 000000000000..8a5ece82d9ce --- /dev/null +++ b/pkgs/development/python-modules/pyside6/qt-6.7.1.patch @@ -0,0 +1,87 @@ +--- a/PySide6/QtMultimedia/CMakeLists.txt ++++ b/PySide6/QtMultimedia/CMakeLists.txt +@@ -12,6 +12,7 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp ++${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp +@@ -28,7 +29,6 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp +-${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp + ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp +diff --git a/PySide6/QtMultimedia/typesystem_multimedia.xml b/PySide6/QtMultimedia/typesystem_multimedia.xml +index dd58f41cc..d37eb15fd 100644 +--- a/PySide6/QtMultimedia/typesystem_multimedia.xml ++++ b/PySide6/QtMultimedia/typesystem_multimedia.xml +@@ -9,7 +9,7 @@ + + + +- ++ + + + +@@ -65,9 +65,6 @@ + + + +- +- +- + + + +@@ -82,9 +79,6 @@ + + + +- +- +- + + + +diff --git a/PySide6/glue/qtmultimedia.cpp b/PySide6/glue/qtmultimedia.cpp +index d193b1bd3..ac8434b97 100644 +--- a/PySide6/glue/qtmultimedia.cpp ++++ b/PySide6/glue/qtmultimedia.cpp +@@ -2,6 +2,7 @@ + // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + + // @snippet qvideoframe-bits ++#include "object.h" + %BEGIN_ALLOW_THREADS + %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1); + %END_ALLOW_THREADS +@@ -23,5 +24,5 @@ const auto size = %CPPSELF.byteCount(); + + // @snippet qtaudio-namespace-compatibility-alias + Py_INCREF(pyType); +-PyModule_AddObject(module, "QAudio", reinterpret_cast(pyType)); ++PyModule_AddObject(module, "QtAudio", reinterpret_cast(pyType)); + // @snippet qtaudio-namespace-compatibility-alias +diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp +index 625e4a405..557f130e0 100644 +--- a/libpyside/signalmanager.cpp ++++ b/libpyside/signalmanager.cpp +@@ -813,11 +813,6 @@ static PyObject *parseArguments(const QMetaMethod &method, void **args) + for (qsizetype i = 0; i < argsSize; ++i) { + void *data = args[i+1]; + auto param = paramTypes.at(i); +-#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +- // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals +- if (param.startsWith("QAudio::"_ba)) +- param.insert(1, 't'); +-#endif + Shiboken::Conversions::SpecificConverter converter(param.constData()); + if (!converter) { + PyErr_SetString(PyExc_TypeError, msgCannotConvertParameter(method, i).constData()); + From 622ccf42c2cf98553c7a79522b718a16a37a3ec3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 14:30:23 +0200 Subject: [PATCH 271/311] nixosTests.nixos-test-driver: fix ruff check --- nixos/lib/test-driver/test_driver/logger.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py index 6fb8a3cf4e5d..484829254b81 100644 --- a/nixos/lib/test-driver/test_driver/logger.py +++ b/nixos/lib/test-driver/test_driver/logger.py @@ -53,7 +53,6 @@ class AbstractLogger(ABC): class JunitXMLLogger(AbstractLogger): - class TestCaseState: def __init__(self) -> None: self.stdout = "" @@ -227,7 +226,7 @@ class XMLLogger(AbstractLogger): def __init__(self, outfile: str) -> None: self.logfile_handle = codecs.open(outfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") - self.queue: "Queue[Dict[str, str]]" = Queue() + self.queue: Queue[dict[str, str]] = Queue() self._print_serial_logs = True From ccbea646d972374de52a83587ec6ebd1fb3d03e6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 22 May 2024 15:34:54 +0200 Subject: [PATCH 272/311] multipath-tools: 0.9.6 -> 0.9.8 --- pkgs/os-specific/linux/multipath-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 5ec8197451cf..979974d6a46a 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-X4sAMGn4oBMY3cQkVj1dMcrDF7FgMl8SbZeUnCCOY6Q="; + sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk="; }; postPatch = '' substituteInPlace create-config.mk \ --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace multipathd/multipathd.service \ + substituteInPlace multipathd/multipathd.service.in \ --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' From 92bd0804a915c6de802af524c8b129d164ff24b0 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 22 May 2024 15:26:56 +0200 Subject: [PATCH 273/311] multipath-tools: backport build fix for musl libc 1.2.5 --- pkgs/os-specific/linux/multipath-tools/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 979974d6a46a..b0469c5eaf79 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , coreutils , perl @@ -30,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk="; }; + patches = [ + # Backport build fix for musl libc 1.2.5 + (fetchpatch { + url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch"; + hash = "sha256-ZvNFVphB9f+S/XMxktR6P/YYSTLeJXEsj4XrAnw6GUI="; + excludes = ["tests/util.c"]; + }) + ]; + postPatch = '' substituteInPlace create-config.mk \ --replace /bin/echo ${coreutils}/bin/echo From 95a3cca9cb4addc8da963d1351309ac60d700c9b Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 23 May 2024 11:02:45 +0200 Subject: [PATCH 274/311] multipath-tools: use --replace-fail in substitutions --- pkgs/os-specific/linux/multipath-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index b0469c5eaf79..ebb8cc03d37c 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -42,10 +42,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace create-config.mk \ - --replace /bin/echo ${coreutils}/bin/echo + --replace-fail /bin/echo ${coreutils}/bin/echo substituteInPlace multipathd/multipathd.service.in \ - --replace /sbin/multipathd "$out/bin/multipathd" + --replace-fail /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = '' # skip test attempting to access /sys/dev/block - substituteInPlace tests/Makefile --replace ' devt ' ' ' + substituteInPlace tests/Makefile --replace-fail ' devt ' ' ' ''; nativeCheckInputs = [ cmocka ]; From 0989d93c00d66d2b12e1dbdf8c041705c9481823 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 23 May 2024 10:18:08 +0200 Subject: [PATCH 275/311] sd-switch: 0.3.0 -> 0.4.0 Also, switch home page to sourcehut one and add update script passthru. --- pkgs/os-specific/linux/sd-switch/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index 7750862c34c2..4f80ce5d6b2b 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromSourcehut, rustPlatform, pkg-config, dbus }: +{ lib, fetchFromSourcehut, rustPlatform, nix-update-script }: -let version = "0.3.0"; +let version = "0.4.0"; in rustPlatform.buildRustPackage { pname = "sd-switch"; inherit version; @@ -9,18 +9,20 @@ in rustPlatform.buildRustPackage { owner = "~rycee"; repo = "sd-switch"; rev = version; - hash = "sha256-mWrLbCUnoJ3hVtpSU/7dw91U5TLyw5kNchX5nmP9asA="; + hash = "sha256-PPFYH34HAD/vC+9jpA1iPQRVNR6MX8ncSPC+7bl2oHY="; }; - cargoHash = "sha256-VK+kPX1pGhowbWKkUs1PL0DXIhDXJOFVoIHTtWQcWEs="; + cargoHash = "sha256-zUoa7nPNFvnYekbEZwtnJKZ6qd47Sb4LZGEkaKVQ9ZQ="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus ]; + passthru = { + updateScript = nix-update-script { }; + }; meta = with lib; { description = "A systemd unit switcher for Home Manager"; mainProgram = "sd-switch"; - homepage = "https://gitlab.com/rycee/sd-switch"; + homepage = "https://git.sr.ht/~rycee/sd-switch"; + changelog = "https://git.sr.ht/~rycee/sd-switch/refs/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rycee ]; platforms = platforms.linux; From ddfeae5217ab2e052547ac254d26a8ea2ede4528 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 23 May 2024 15:04:22 +0200 Subject: [PATCH 276/311] pythonPackages: remove unused fetchpath arguments --- pkgs/development/python-modules/aioitertools/default.nix | 1 - pkgs/development/python-modules/aiorecollect/default.nix | 1 - pkgs/development/python-modules/argh/default.nix | 1 - pkgs/development/python-modules/autopep8/default.nix | 1 - pkgs/development/python-modules/bash-kernel/default.nix | 1 - pkgs/development/python-modules/broadbean/default.nix | 1 - pkgs/development/python-modules/camelot/default.nix | 2 -- pkgs/development/python-modules/cartopy/default.nix | 1 - pkgs/development/python-modules/cnvkit/default.nix | 1 - pkgs/development/python-modules/datasets/default.nix | 1 - .../development/python-modules/django-cryptography/default.nix | 1 - pkgs/development/python-modules/django-js-reverse/default.nix | 1 - .../python-modules/django-pattern-library/default.nix | 1 - pkgs/development/python-modules/django-silk/default.nix | 1 - pkgs/development/python-modules/django/5.nix | 1 - pkgs/development/python-modules/dot2tex/default.nix | 1 - pkgs/development/python-modules/ed25519/default.nix | 1 - pkgs/development/python-modules/elkm1-lib/default.nix | 1 - pkgs/development/python-modules/envisage/default.nix | 1 - pkgs/development/python-modules/envoy-reader/default.nix | 1 - pkgs/development/python-modules/flask-babel/default.nix | 1 - pkgs/development/python-modules/fontbakery/default.nix | 1 - pkgs/development/python-modules/fontfeatures/default.nix | 1 - pkgs/development/python-modules/hdbscan/default.nix | 1 - .../python-modules/insteon-frontend-home-assistant/default.nix | 1 - pkgs/development/python-modules/kivy/default.nix | 1 - pkgs/development/python-modules/ledgerwallet/default.nix | 1 - pkgs/development/python-modules/mahotas/default.nix | 1 - .../python-modules/mdx-truly-sane-lists/default.nix | 1 - pkgs/development/python-modules/mpi4py/default.nix | 1 - pkgs/development/python-modules/opensfm/default.nix | 1 - pkgs/development/python-modules/parso/default.nix | 1 - pkgs/development/python-modules/plux/default.nix | 1 - pkgs/development/python-modules/plyer/default.nix | 1 - pkgs/development/python-modules/proxy-py/default.nix | 1 - .../development/python-modules/py-sr25519-bindings/default.nix | 1 - pkgs/development/python-modules/pyahocorasick/default.nix | 1 - pkgs/development/python-modules/pyfireservicerota/default.nix | 1 - pkgs/development/python-modules/pyinfra/default.nix | 1 - pkgs/development/python-modules/pyiqvia/default.nix | 1 - pkgs/development/python-modules/pymongo-inmemory/default.nix | 1 - pkgs/development/python-modules/pyopencl/default.nix | 2 -- pkgs/development/python-modules/pyregion/default.nix | 1 - pkgs/development/python-modules/pyrtlsdr/default.nix | 1 - pkgs/development/python-modules/pysigma/default.nix | 1 - .../python-modules/pytest-astropy-header/default.nix | 2 -- pkgs/development/python-modules/python-daemon/default.nix | 2 -- pkgs/development/python-modules/python-mapnik/default.nix | 1 - .../python-modules/python-u2flib-server/default.nix | 1 - pkgs/development/python-modules/pythran/default.nix | 1 - pkgs/development/python-modules/pyvis/default.nix | 1 - pkgs/development/python-modules/pyvo/default.nix | 1 - pkgs/development/python-modules/qiskit-aer/default.nix | 3 --- pkgs/development/python-modules/requests/default.nix | 1 - pkgs/development/python-modules/riscv-config/default.nix | 1 - pkgs/development/python-modules/rollbar/default.nix | 1 - pkgs/development/python-modules/rpy2/default.nix | 1 - pkgs/development/python-modules/ruyaml/default.nix | 1 - pkgs/development/python-modules/sanic/default.nix | 1 - pkgs/development/python-modules/scalene/default.nix | 1 - pkgs/development/python-modules/scikit-misc/default.nix | 1 - pkgs/development/python-modules/single-version/default.nix | 1 - pkgs/development/python-modules/slicer/default.nix | 1 - .../python-modules/sphinxcontrib-openapi/default.nix | 1 - pkgs/development/python-modules/sqlalchemy-utils/default.nix | 1 - pkgs/development/python-modules/sqlite-utils/default.nix | 1 - pkgs/development/python-modules/tololib/default.nix | 1 - pkgs/development/python-modules/uarray/default.nix | 1 - pkgs/development/python-modules/urwid-mitmproxy/default.nix | 3 --- pkgs/development/python-modules/vllm/default.nix | 1 - pkgs/development/python-modules/watchdog/default.nix | 1 - pkgs/development/python-modules/xdis/default.nix | 2 -- 72 files changed, 81 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 3f4870df41ad..6d59d99d14c8 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pythonOlder, diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 9cb3cca5d666..57a59497bbc6 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -4,7 +4,6 @@ aresponses, buildPythonPackage, fetchFromGitHub, - fetchpatch, freezegun, poetry-core, pytest-asyncio, diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 145682871993..ee3a26f91ee0 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, flit-core, iocapture, mock, diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 316d9edc1a1d..005e97875c14 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, glibcLocales, pycodestyle, pytestCheckHook, diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 8ed6a8c79cfe..0df270f8a2b7 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, flit-core, ipykernel, python, diff --git a/pkgs/development/python-modules/broadbean/default.nix b/pkgs/development/python-modules/broadbean/default.nix index 50bc96bdea6d..e1c47cea6d31 100644 --- a/pkgs/development/python-modules/broadbean/default.nix +++ b/pkgs/development/python-modules/broadbean/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, setuptools, versioningit, diff --git a/pkgs/development/python-modules/camelot/default.nix b/pkgs/development/python-modules/camelot/default.nix index 4331d564b716..08b73672bcae 100644 --- a/pkgs/development/python-modules/camelot/default.nix +++ b/pkgs/development/python-modules/camelot/default.nix @@ -1,12 +1,10 @@ { lib, - stdenv, buildPythonPackage, chardet, openpyxl, charset-normalizer, fetchPypi, - fetchpatch, pythonOlder, pandas, tabulate, diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 9df147a45c5f..d37818d00be7 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - fetchpatch, cython, setuptools-scm, geos, diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 4769bd2e57c6..1667a010a40e 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, rPackages, buildPythonPackage, biopython, diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 4ba7b08c0fb0..76f53b224e16 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, dill, fetchFromGitHub, - fetchpatch, fsspec, huggingface-hub, importlib-metadata, diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 74ede8be539e..d5849498ecfd 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -4,7 +4,6 @@ django, django-appconf, fetchFromGitHub, - fetchpatch, lib, python, pythonOlder, diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix index 9fedef235c11..3e344f881395 100644 --- a/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonAtLeast, - fetchpatch, fetchFromGitHub, python, django, diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 79fb13d7fa18..0aaa35f940dc 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, lib, # build-system diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index a5cbf8e8aa2a..796e07c93a3e 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -5,7 +5,6 @@ django, factory-boy, fetchFromGitHub, - fetchpatch, freezegun, gprof2dot, jinja2, diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index ba599684fd71..233fa7532235 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonAtLeast, pythonOlder, substituteAll, diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index 5fbe44c98d55..acd9bbc34a1f 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, substituteAll, pyparsing, diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index ca34e5dcfeb9..1f10b9be005d 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonOlder, setuptools, versioneer, diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index cf8c39c308dd..a1c04262a5bb 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -3,7 +3,6 @@ async-timeout, buildPythonPackage, fetchFromGitHub, - fetchpatch, poetry-core, pyserial-asyncio-fast, pytest-asyncio, diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 5eab0a1a3dda..94964c9a581a 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -3,7 +3,6 @@ apptools, buildPythonPackage, fetchPypi, - fetchpatch, ipython, pytestCheckHook, pythonAtLeast, diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index 53d67fba4506..3f91c0c69e6a 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, envoy-utils, fetchFromGitHub, - fetchpatch, httpx, pyjwt, pytest-asyncio, diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index f1e911f0e321..dfeda89807aa 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system poetry-core, diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 89de0dbe6831..d98575536419 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, callPackage, - fetchpatch, fetchPypi, axisregistry, babelfont, diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix index 8902a962a910..b6a4482b4ba4 100644 --- a/pkgs/development/python-modules/fontfeatures/default.nix +++ b/pkgs/development/python-modules/fontfeatures/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, beziers, fonttools, fs, diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 99194c06e2ee..2fedf4792c64 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, cython, numpy, pytestCheckHook, diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 29420769833e..e52ce4a2ea18 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchpatch, fetchPypi, pythonOlder, setuptools, diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix index 9b39aa1fd058..a4a5da1640a6 100644 --- a/pkgs/development/python-modules/kivy/default.nix +++ b/pkgs/development/python-modules/kivy/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pkg-config, cython_0, docutils, diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index b24d831b1e8f..ebf686427df3 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, buildPythonPackage, cryptography, click, diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 419c1c572de1..144aae89c79d 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchFromGitHub, - fetchpatch, pillow, scipy, numpy, diff --git a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index 07dc9f00277c..61e7408c96ad 100644 --- a/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, markdown, python, }: diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1c3d0a2f850f..43c4040fba72 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, - fetchpatch, python, buildPythonPackage, mpi, diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index dc7f6d4163a8..bd5b97ab2852 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, cmake, opencv4, ceres-solver, diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index bb0bf239d95a..2030f7969790 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonAtLeast, pythonOlder, pytestCheckHook, diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 5c0d6d1fb28c..c88994374800 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, setuptools, stevedore, diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 1bc2ff92675e..6a77e4a56005 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, keyring, mock, pytestCheckHook, diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 384dd6c1ec08..6a09b16a5cd9 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -4,7 +4,6 @@ bash, buildPythonPackage, fetchFromGitHub, - fetchpatch, gnumake, h2, hpack, diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 04a037cd9a9b..51915de513a7 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, buildPythonPackage, pythonOlder, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 9ae189019fcb..51ec19016c77 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, }: diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 741b11edfcff..4042c0a235c5 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchPypi, - fetchpatch2, pdm-backend, pytz, oauthlib, diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 4bea65f82511..80b1d43ef6ed 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -6,7 +6,6 @@ configparser, distro, fetchFromGitHub, - fetchpatch, gevent, jinja2, paramiko, diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index 2af120b22c2e..dbc41c1c7851 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -6,7 +6,6 @@ backoff, certifi, fetchFromGitHub, - fetchpatch, poetry-core, pytest-aiohttp, pytest-asyncio, diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index da76c5d01df3..2b9d9b924369 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, poetry-core, pymongo, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index d0a3ffba5c71..ffce3a97b0c6 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -3,7 +3,6 @@ stdenv, fetchPypi, buildPythonPackage, - fetchpatch, appdirs, cffi, decorator, @@ -15,7 +14,6 @@ opencl-headers, platformdirs, pybind11, - pytest, pytestCheckHook, pytools, setuptools, diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 50d66c8e7319..d096a5d0c7b8 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, # needed to build cython, oldest-supported-numpy, diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 4097cfddbdfe..21a3b1b4bd1a 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, rtl-sdr, setuptools, pythonOlder, diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 5816b43926ac..e089421eb7ad 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, jinja2, packaging, poetry-core, diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index edaa756b7870..8b87d4422b57 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pytest, - pytest-cov, pytestCheckHook, numpy, setuptools-scm, diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 802abf87d086..bb6cf5d94ea1 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -8,9 +8,7 @@ testscenarios, testtools, twine, - python, pythonOlder, - fetchpatch, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index a68a618ccd46..c93adc9f09db 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, substituteAll, isPyPy, python, diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index d64370a3e095..e1b44777dfee 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # propagates cryptography, diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index dbf1f0f50527..e99283bc49ae 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -3,7 +3,6 @@ python, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPy3k, substituteAll, diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index d7bc582a551c..ae152c2286ac 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, buildPythonPackage, setuptools, networkx, diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 382877c477d8..dd6e670e7823 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, astropy, pillow, pythonOlder, diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7106f74578a3..18bd47bf5bf7 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -1,10 +1,8 @@ { - stdenv, lib, pythonOlder, buildPythonPackage, fetchFromGitHub, - fetchpatch, # C Inputs blas, catch2, @@ -26,7 +24,6 @@ fixtures, pytest-timeout, qiskit-terra, - setuptools, testtools, }: diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 3c4be1f8c1f6..ef4526a70918 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -7,7 +7,6 @@ chardet, charset-normalizer, fetchPypi, - fetchpatch, idna, pysocks, pytest-mock, diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index dbbf8f7b29d6..120f9fd5c537 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, cerberus, fetchFromGitHub, - fetchpatch, pythonOlder, pyyaml, ruamel-yaml, diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 323f123377e6..40e97073c7bc 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -4,7 +4,6 @@ blinker, buildPythonPackage, fetchPypi, - fetchpatch, httpx, mock, pytestCheckHook, diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 65ae9652cd06..ba1c265afe42 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -3,7 +3,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, isPyPy, R, rWrapper, diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 6256f3556107..0bcd0dd7a71d 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, distro, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools-scm, diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 33779a6f6191..939d68c5f3fe 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pythonAtLeast, # build-system diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix index 2abf29f66205..1d635edbedd9 100644 --- a/pkgs/development/python-modules/scalene/default.nix +++ b/pkgs/development/python-modules/scalene/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, hypothesis, - fetchpatch, fetchPypi, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index 483acaa5de96..5b6e9f347b3c 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, cython, gfortran, git, diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index 72f1c003f99e..e08878e89f58 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, poetry-core, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index 8f7a27e31c53..79e514f7ee9b 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, dos2unix, - fetchpatch, fetchPypi, pytestCheckHook, pythonOlder, diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index eebc7ed12ba0..1076db106fcb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deepmerge, fetchPypi, - fetchpatch, isPy27, setuptools-scm, jsonschema, diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 36f8b3ad9c92..e4865cd091af 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, # runtime diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 4719a7d71417..99800ceadbcf 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch, pythonOlder, click, click-default-group, diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 2ab0dbd7c89a..03bb2f2ea81e 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitLab, - fetchpatch, pytestCheckHook, pythonOlder, setuptools-scm, diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 57dbc81c632d..731da3b75fbe 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, setuptools, setuptools-scm, matchpy, diff --git a/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/pkgs/development/python-modules/urwid-mitmproxy/default.nix index f830a9906617..09e28d283963 100644 --- a/pkgs/development/python-modules/urwid-mitmproxy/default.nix +++ b/pkgs/development/python-modules/urwid-mitmproxy/default.nix @@ -2,10 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, - glibcLocales, pythonOlder, - unittestCheckHook, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 8b06a66c1d01..e2bbe12c639c 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, which, ninja, packaging, diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index f7879285e19f..16be1cf5b48c 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, CoreServices, eventlet, - fetchpatch, fetchPypi, flaky, pytest-timeout, diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 20169ea57e7a..ebbad75f8408 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch, pytestCheckHook, - pythonAtLeast, pythonOlder, six, }: From cc68d49224ce61ed8b0c1925248d6246a0f28352 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 13:31:00 +0000 Subject: [PATCH 277/311] cloud-nuke: 0.35.0 -> 0.36.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 122a9826d664..b402de727cf6 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mSkQW4fSpylbOS8x/o/578NV+SU4ao/yqB81Ifb7LFQ="; + hash = "sha256-OFfcr8BXkTEB6lxImwHVFxnvursGcg83dVWsjegKf4w="; }; - vendorHash = "sha256-Fmfr9feTibAjiZaakJalGTS7X2RhGz6engMNhy48Zus="; + vendorHash = "sha256-ealTxDNG6uJc0Lb20e8W3zv0azgpwI2kBn92d0lWaoc="; nativeBuildInputs = [ makeBinaryWrapper From 2ba59d41ddd852a2701dbd0e72fd9a5bbf002281 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 13:40:34 +0000 Subject: [PATCH 278/311] eksctl: 0.177.0 -> 0.178.0 --- pkgs/by-name/ek/eksctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index e012e298dbe0..f8be0d794e85 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.177.0"; + version = "0.178.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-rNs7Ko+NNO2/zqPRu4j+y7KJ62lvfTEndZEnBSi8K5I="; + hash = "sha256-4L2BYQw0hticbPUdqJwOGNUYFBc8whnBW+1xut3Mp5Y="; }; - vendorHash = "sha256-0ZEVOsfb4FBGhNk7CoP7KDhApPTLBz4l5kwcRRBIq5g="; + vendorHash = "sha256-M/OiHXsvPAaYVNw7Q9LiDbH7B7QhBQxmK0H8TNWcu74="; doCheck = false; From cd71793bb2e146b673329269c4e40ad5ee310daa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:30:37 +0200 Subject: [PATCH 279/311] python312Packages.faraday-agent-parameters-types: 1.5.1 -> 1.6.0 Changelog: https://github.com/infobyte/faraday_agent_parameters_types/blob/1.6.0/CHANGELOG.md --- .../python-modules/faraday-agent-parameters-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index 4970f246fab9..f21f66dc0680 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.5.1"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-Bh1s0IeUEa4EnGElQn5ruBxFSbcOqsrDqbw1nVjdi5s="; + hash = "sha256-yw4u1xhfY9WYLSf9CNAsiDpY7y2Llf8j4gDoNZjACw0="; }; postPatch = '' From f3b254dae286f477ec7cee9841af86f274392240 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:31:29 +0200 Subject: [PATCH 280/311] python312Packages.faraday-agent-parameters-types: refactor --- .../faraday-agent-parameters-types/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index f21f66dc0680..ac88fb2249be 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { --replace-warn '"pytest-runner",' "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ marshmallow packaging ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { description = "Collection of Faraday agent parameters types"; homepage = "https://github.com/infobyte/faraday_agent_parameters_types"; changelog = "https://github.com/infobyte/faraday_agent_parameters_types/blob/${version}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus ]; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; } From 2864759231ca861b876bda3a083788b784cefad3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:32:04 +0200 Subject: [PATCH 281/311] python312Packages.faraday-plugins: 1.17.0 -> 1.18.0 Diff: https://github.com/infobyte/faraday_plugins/compare/refs/tags/1.17.0...1.18.0 Changelog: https://github.com/infobyte/faraday_plugins/releases/tag/1.18.0 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index ec509ea3841b..187fefb9124b 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-EE61RPantD1u9NNhyPRjoRkBifM3u16b0BC2aQC8UBA="; + hash = "sha256-oYE7Iik0+CbOfxF9IeeZotpGqV8TTz15MxJEC4VBrhk="; }; postPatch = '' From 1c64a2fb1102be96303282a17f613ad7caeb72b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:33:44 +0200 Subject: [PATCH 282/311] python312Packages.faraday-plugins: refactor --- .../python-modules/faraday-plugins/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 187fefb9124b..7668dd48da54 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -34,12 +34,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-warn "version=version," "version='${version}'," + --replace-fail "version=version," "version='${version}'," ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 click colorama @@ -73,10 +73,10 @@ buildPythonPackage rec { meta = with lib; { description = "Security tools report parsers for Faraday"; - mainProgram = "faraday-plugins"; homepage = "https://github.com/infobyte/faraday_plugins"; changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${version}"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "faraday-plugins"; }; } From 1461dbbee35356d6aea102da072df380b0a5749c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 May 2024 10:32:05 +0200 Subject: [PATCH 283/311] ocamlPackages.eio_*: inherit patches from eio If we're inheriting src from eio to use the same source tree, it makes sense to inherit patches as well. Currently we don't apply patches to eio, but this is useful for overlays, and will help avoid a potential oversight if we do need a patch in future. --- pkgs/development/ocaml-modules/eio/linux.nix | 2 +- pkgs/development/ocaml-modules/eio/main.nix | 2 +- pkgs/development/ocaml-modules/eio/posix.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/eio/linux.nix b/pkgs/development/ocaml-modules/eio/linux.nix index b376f709794a..f6ed30d4e80d 100644 --- a/pkgs/development/ocaml-modules/eio/linux.nix +++ b/pkgs/development/ocaml-modules/eio/linux.nix @@ -7,7 +7,7 @@ buildDunePackage { pname = "eio_linux"; - inherit (eio) meta src version; + inherit (eio) meta src patches version; minimalOCamlVersion = "5.0"; diff --git a/pkgs/development/ocaml-modules/eio/main.nix b/pkgs/development/ocaml-modules/eio/main.nix index 410e53551275..a65b27b8db41 100644 --- a/pkgs/development/ocaml-modules/eio/main.nix +++ b/pkgs/development/ocaml-modules/eio/main.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "eio_main"; - inherit (eio) meta src version; + inherit (eio) meta src patches version; minimalOCamlVersion = "5.0"; diff --git a/pkgs/development/ocaml-modules/eio/posix.nix b/pkgs/development/ocaml-modules/eio/posix.nix index cba34a0d6389..c18cdd506141 100644 --- a/pkgs/development/ocaml-modules/eio/posix.nix +++ b/pkgs/development/ocaml-modules/eio/posix.nix @@ -10,7 +10,7 @@ buildDunePackage { pname = "eio_posix"; - inherit (eio) meta src version; + inherit (eio) meta src patches version; minimalOCamlVersion = "5.0"; From c48dd1b43abf0a25936991d4685c5592e040a372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 14:41:59 +0000 Subject: [PATCH 284/311] goimports-reviser: 3.6.4 -> 3.6.5 --- pkgs/development/tools/goimports-reviser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/development/tools/goimports-reviser/default.nix index 437b27ce8435..b7bdf8632164 100644 --- a/pkgs/development/tools/goimports-reviser/default.nix +++ b/pkgs/development/tools/goimports-reviser/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goimports-reviser"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "incu6us"; repo = "goimports-reviser"; rev = "v${version}"; - hash = "sha256-+GVC/qJnqWm5tsn2Y5BPafapp7ct9kqHWlDNxukEZsM="; + hash = "sha256-46s6A1sGqoJR3XihaCkVCxTpManl330mMcJ8hv66zDc="; }; vendorHash = "sha256-z+FeAXPXKi653im2X2WOP1R9gRl/x7UBnndoEXoxdwA="; From 143e613bee6b3ec4a34bda043577279d4c054e80 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 16:42:57 +0200 Subject: [PATCH 285/311] python311Packages.qgrid: fix python 3.12 compatibility --- .../python-modules/qgrid/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index 5fa79708ffa7..d385c2943704 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -4,6 +4,7 @@ fetchpatch, fetchPypi, ipywidgets, + looseversion, notebook, pandas, pytestCheckHook, @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "qgrid"; version = "1.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -28,8 +29,14 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace qgrid/grid.py \ + --replace-fail "from distutils.version import LooseVersion" "from looseversion import LooseVersion" + ''; + + dependencies = [ ipywidgets + looseversion notebook pandas ]; @@ -48,10 +55,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "qgrid" ]; - meta = with lib; { + meta = { description = "An interactive grid for sorting, filtering, and editing DataFrames in Jupyter notebooks"; homepage = "https://github.com/quantopian/qgrid"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From d9fae5e20dbb3017973cba1fa8d58318e2cb1d30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:44:51 +0200 Subject: [PATCH 286/311] python312Packages.pyedimax: refactor --- .../python-modules/pyedimax/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyedimax/default.nix b/pkgs/development/python-modules/pyedimax/default.nix index 350525b40286..dff8a0ffa899 100644 --- a/pkgs/development/python-modules/pyedimax/default.nix +++ b/pkgs/development/python-modules/pyedimax/default.nix @@ -3,28 +3,35 @@ buildPythonPackage, fetchPypi, requests, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyedimax"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1i3gr5vygqh2ryg67sl13aaql7nvf3nbybrg54628r4g7911b5rk"; + hash = "sha256-M5cVQjqPZCQMKS8vv+xw2x6KlRqB6mOezwLi53fJb8Q="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - # Project has no tests + dependencies = [ requests ]; + + # Module has no tests doCheck = false; + pythonImportsCheck = [ "pyedimax" ]; meta = with lib; { description = "Python library for interfacing with the Edimax smart plugs"; homepage = "https://github.com/andreipop2005/pyedimax"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From d2305783db0509dcf2e3ab897b8b91707874251d Mon Sep 17 00:00:00 2001 From: Lana Black Date: Sat, 18 May 2024 00:10:08 +0000 Subject: [PATCH 287/311] amarok: 2.9.71 -> 3.0.0 --- pkgs/applications/audio/amarok/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index e48e27b5cc69..405e0464b333 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,23 +1,23 @@ -{ mkDerivation, fetchurl, lib +{ stdenv, fetchurl, lib , extra-cmake-modules, kdoctools , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem -, fftw, phonon, plasma-framework, threadweaver, breeze-icons +, fftw, phonon, plasma-framework, threadweaver, breeze-icons, wrapQtAppsHook , curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mariadb-embedded, pcre, snappy, taglib, taglib_extras }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "2.9.71"; + version = "3.0.0"; src = fetchurl { - url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0kz8wixjmy4yxq2gk11ybswryxb6alfymd3bzcar9xinscllhh3a"; + url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-FKh2eDBfrXagodrKVVpndf+mQuXrvMzs2R9JcJOZLBw="; }; outputs = [ "out" "doc" ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; propagatedBuildInputs = [ qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine @@ -35,4 +35,4 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; }; -} +}) From 1f5606f6adef7cfe72869d507554e317719f9c06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 May 2024 16:49:39 +0200 Subject: [PATCH 288/311] python312Packages.pyecowitt: refactor --- .../python-modules/pyecowitt/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyecowitt/default.nix b/pkgs/development/python-modules/pyecowitt/default.nix index e39c70baca79..0786f87c7e29 100644 --- a/pkgs/development/python-modules/pyecowitt/default.nix +++ b/pkgs/development/python-modules/pyecowitt/default.nix @@ -4,23 +4,26 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pyecowitt"; version = "0.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "garbled1"; - repo = pname; - rev = version; - sha256 = "5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ="; + repo = "pyecowitt"; + rev = "refs/tags/${version}"; + hash = "sha256-5VdVo6j2HZXSCWU4NvfWzyS/KJfVb7N1KSMeu8TvWaQ="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project thas no tests doCheck = false; @@ -30,7 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the EcoWitt Protocol"; homepage = "https://github.com/garbled1/pyecowitt"; - license = with licenses; [ asl20 ]; + changelog = "https://github.com/garbled1/pyecowitt/releases/tag/${version}"; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } From afffe11b2e264c52ea8334188e3947192ad86c8b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 23 May 2024 16:56:25 +0200 Subject: [PATCH 289/311] python311Packages.svgelements: fix tests --- .../python-modules/svgelements/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/svgelements/default.nix b/pkgs/development/python-modules/svgelements/default.nix index 239b7db7f67a..7e4709ff5a08 100644 --- a/pkgs/development/python-modules/svgelements/default.nix +++ b/pkgs/development/python-modules/svgelements/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, setuptools, wheel, anyio, @@ -25,7 +26,15 @@ buildPythonPackage rec { hash = "sha256-nx2sGXeeh8S17TfRDFifQbdSxc4YGsDNnrPSSbxv7S4="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch { + name = "fix-assert-tests"; + url = "https://github.com/meerk40t/svgelements/commit/23da98941a94cf1afed39c10750222ccfee73c9f.patch"; + hash = "sha256-/53w4eWlaSNEQxuoAxPrN2HciZ3Az2A2SKcIAlNgKAs="; + }) + ]; + + build-system = [ setuptools wheel ]; @@ -42,10 +51,10 @@ buildPythonPackage rec { scipy ]; - meta = with lib; { + meta = { description = "SVG Parsing for Elements, Paths, and other SVG Objects"; homepage = "https://github.com/meerk40t/svgelements"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 7496ea87763ae3d91f45da42805e4d7b10219849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 15:17:39 +0000 Subject: [PATCH 290/311] hyprlang: 0.5.1 -> 0.5.2 --- pkgs/by-name/hy/hyprlang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 8cb98c4e79cf..729a4284b395 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0="; + hash = "sha256-Jq9hHYFL5nMHArWgJIcrDHGnzs/MjDi95cyB7cUZIJ4="; }; nativeBuildInputs = [ From 4731605e889c7062907f1fd9bb3bc6cb198144be Mon Sep 17 00:00:00 2001 From: Tobi Oloke <93312805+tobz619@users.noreply.github.com> Date: Thu, 23 May 2024 17:43:59 +0200 Subject: [PATCH 291/311] mediasynclite: init at 0.4.2 (#294716) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 +++ pkgs/by-name/me/mediasynclite/package.nix | 54 +++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/me/mediasynclite/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d7b7f0c43316..3eeee70283f4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20714,6 +20714,12 @@ githubId = 858790; name = "Tobias Mayer"; }; + tobz619 = { + email = "toloke@yahoo.co.uk"; + github = "tobz619"; + githubId = 93312805; + name = "Tobi Oloke"; + }; tochiaha = { email = "tochiahan@proton.me"; github = "Tochiaha"; diff --git a/pkgs/by-name/me/mediasynclite/package.nix b/pkgs/by-name/me/mediasynclite/package.nix new file mode 100644 index 000000000000..8d2725997b0c --- /dev/null +++ b/pkgs/by-name/me/mediasynclite/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, glib +, gsettings-desktop-schemas +, pkg-config +, curl +, openssl +, jansson +, wrapGAppsHook3 +}: + +stdenv.mkDerivation rec { + pname = "mediasynclite"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "iBroadcastMediaServices"; + repo = "MediaSyncLiteLinux"; + rev = version; + hash = "sha256-ToSkR6tPJMBCcj1NUBAywKjCAPlpmh+ngIopFrT2PIA="; + }; + + buildInputs = [ + curl + glib + gtk3 + openssl + jansson + ]; + + strictDeps = true; + + nativeBuildInputs = [ + gsettings-desktop-schemas + pkg-config + wrapGAppsHook3 + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + substitute ./src/ibmsl.c ./src/ibmsl.c --subst-var out + ''; + + meta = with lib; { + description = "A Linux-native graphical uploader for iBroadcast"; + downloadPage = "https://github.com/tobz619/MediaSyncLiteLinuxNix"; + homepage = "https://github.com/iBroadcastMediaServices/MediaSyncLiteLinux"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tobz619 ]; + }; +} From c7d9fae3fd4d4736df692f63528292dfa450f307 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 23 May 2024 14:19:54 +0300 Subject: [PATCH 292/311] kdePackages: Gear 24.02 -> 24.05 - kio-extras-kf5 moved to misc because of release schedule weirdness - calindori ported to KF6, reenabled - some build fixes all over - add 7zip to a bunch of games for SVG compression --- .../scripts/kde/collect-missing-deps.py | 8 + pkgs/kde/default.nix | 2 +- .../gear/accessibility-inspector/default.nix | 4 + pkgs/kde/gear/akonadi-search/default.nix | 2 +- pkgs/kde/gear/angelfish/default.nix | 2 +- pkgs/kde/gear/audex/default.nix | 10 + pkgs/kde/gear/bovo/default.nix | 3 + pkgs/kde/gear/calindori/default.nix | 8 +- pkgs/kde/gear/default.nix | 6 +- pkgs/kde/gear/francis/default.nix | 9 + pkgs/kde/gear/kalm/default.nix | 4 + pkgs/kde/gear/katomic/default.nix | 8 +- pkgs/kde/gear/kblackbox/default.nix | 3 + pkgs/kde/gear/kbounce/default.nix | 3 + pkgs/kde/gear/kdepim-addons/default.nix | 2 +- pkgs/kde/gear/kfourinline/default.nix | 2 + pkgs/kde/gear/kjumpingcube/default.nix | 3 + pkgs/kde/gear/klickety/default.nix | 8 +- pkgs/kde/gear/klines/default.nix | 8 +- pkgs/kde/gear/kmines/default.nix | 8 +- pkgs/kde/gear/knavalbattle/default.nix | 8 +- pkgs/kde/gear/kolf/default.nix | 8 +- pkgs/kde/gear/kollision/default.nix | 8 +- pkgs/kde/gear/kreversi/default.nix | 3 + pkgs/kde/gear/krfb/default.nix | 18 +- .../gear/krfb/fix-build-with-qt-6.7.1.diff | 51 - pkgs/kde/gear/ksudoku/default.nix | 3 + pkgs/kde/gear/kubrick/default.nix | 3 + pkgs/kde/gear/lskat/default.nix | 3 + pkgs/kde/gear/picmi/default.nix | 3 + pkgs/kde/gear/skanpage/default.nix | 2 + pkgs/kde/gear/skladnik/default.nix | 4 + pkgs/kde/gear/spectacle/default.nix | 3 +- pkgs/kde/generated/licenses.json | 74 +- pkgs/kde/generated/sources/gear.json | 1500 +++++++++-------- .../{gear => misc}/kio-extras-kf5/default.nix | 11 +- 36 files changed, 952 insertions(+), 853 deletions(-) create mode 100644 pkgs/kde/gear/accessibility-inspector/default.nix create mode 100644 pkgs/kde/gear/audex/default.nix create mode 100644 pkgs/kde/gear/francis/default.nix create mode 100644 pkgs/kde/gear/kalm/default.nix delete mode 100644 pkgs/kde/gear/krfb/fix-build-with-qt-6.7.1.diff create mode 100644 pkgs/kde/gear/skladnik/default.nix rename pkgs/kde/{gear => misc}/kio-extras-kf5/default.nix (69%) diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py index 9625da71c3e5..3ec1411986c8 100755 --- a/maintainers/scripts/kde/collect-missing-deps.py +++ b/maintainers/scripts/kde/collect-missing-deps.py @@ -80,6 +80,11 @@ OK_MISSING_BY_PACKAGE = { "plasma-desktop": { "scim", # upstream is dead, not packaged in Nixpkgs }, + "poppler-qt6": { + "gobject-introspection-1.0", # we don't actually want to build the GTK variant + "gdk-pixbuf-2.0", + "gtk+-3.0", + }, "powerdevil": { "DDCUtil", # cursed, intentionally disabled }, @@ -87,6 +92,9 @@ OK_MISSING_BY_PACKAGE = { "Qt6Qml", # tests only "Qt6Quick", }, + "skladnik": { + "POVRay", # too expensive to rerender all the assets + }, "syntax-highlighting": { "XercesC", # only used for extra validation at build time } diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 02c8650e6ec6..10579baeca18 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -3,7 +3,6 @@ generateSplicesForMkScope, makeScopeWithSplicing', fetchurl, - fetchFromGitLab, libsForQt5, qt6Packages, cmark, @@ -65,6 +64,7 @@ kdiagram = self.callPackage ./misc/kdiagram {}; kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; kirigami-addons = self.callPackage ./misc/kirigami-addons {}; + kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; kio-fuse = self.callPackage ./misc/kio-fuse {}; ktextaddons = self.callPackage ./misc/ktextaddons {}; kunifiedpush = self.callPackage ./misc/kunifiedpush {}; diff --git a/pkgs/kde/gear/accessibility-inspector/default.nix b/pkgs/kde/gear/accessibility-inspector/default.nix new file mode 100644 index 000000000000..1197f2933008 --- /dev/null +++ b/pkgs/kde/gear/accessibility-inspector/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "accessibility-inspector"; +} diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 416dd91a9ee5..e8b38642a940 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-fY0mQiYS/CMThOVsWp8NgxpWfUph2dZ7hj7W5JUJ2J4=", + cargoHash ? "sha256-xT1SkW5iJy5Y9CK0CSxp+08XXjrbljxZzwYo2fEqxYE=", }: mkKdeDerivation rec { pname = "akonadi-search"; diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 0d9b4a341f05..cda589932b9d 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-QJZJqdixPThgiKnruKetmzhbvtY/MsGy4v+OdQiEFR8=", + cargoHash ? "sha256-94f4DKRXcp3o6l3zbQzCpH2ZOztZMEAHa9ookPxbeDU=", qcoro, }: mkKdeDerivation rec { diff --git a/pkgs/kde/gear/audex/default.nix b/pkgs/kde/gear/audex/default.nix new file mode 100644 index 000000000000..c6043d641608 --- /dev/null +++ b/pkgs/kde/gear/audex/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + libcdio, + libcdio-paranoia, +}: +mkKdeDerivation { + pname = "audex"; + + extraBuildInputs = [libcdio libcdio-paranoia]; +} diff --git a/pkgs/kde/gear/bovo/default.nix b/pkgs/kde/gear/bovo/default.nix index 9e8ae9b05153..5bafedfd1b14 100644 --- a/pkgs/kde/gear/bovo/default.nix +++ b/pkgs/kde/gear/bovo/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "bovo"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "bovo"; } diff --git a/pkgs/kde/gear/calindori/default.nix b/pkgs/kde/gear/calindori/default.nix index f0b21c7986a7..41efa7a9e48f 100644 --- a/pkgs/kde/gear/calindori/default.nix +++ b/pkgs/kde/gear/calindori/default.nix @@ -1,15 +1,9 @@ { mkKdeDerivation, qtsvg, - qqc2-desktop-style, }: mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [ - qtsvg - qqc2-desktop-style - ]; - # FIXME(qt5) - meta.broken = true; + extraBuildInputs = [qtsvg]; } diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index 1ffcdc770e21..b0560b868ee3 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -1,4 +1,5 @@ {callPackage}: { + accessibility-inspector = callPackage ./accessibility-inspector {}; akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar {}; akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; @@ -15,6 +16,7 @@ arianna = callPackage ./arianna {}; ark = callPackage ./ark {}; artikulate = callPackage ./artikulate {}; + audex = callPackage ./audex {}; audiocd-kio = callPackage ./audiocd-kio {}; audiotube = callPackage ./audiotube {}; baloo-widgets = callPackage ./baloo-widgets {}; @@ -34,6 +36,7 @@ falkon = callPackage ./falkon {}; ffmpegthumbs = callPackage ./ffmpegthumbs {}; filelight = callPackage ./filelight {}; + francis = callPackage ./francis {}; ghostwriter = callPackage ./ghostwriter {}; granatier = callPackage ./granatier {}; grantlee-editor = callPackage ./grantlee-editor {}; @@ -51,6 +54,7 @@ kalarm = callPackage ./kalarm {}; kalgebra = callPackage ./kalgebra {}; kalk = callPackage ./kalk {}; + kalm = callPackage ./kalm {}; kalzium = callPackage ./kalzium {}; kamera = callPackage ./kamera {}; kamoso = callPackage ./kamoso {}; @@ -112,7 +116,6 @@ kimap = callPackage ./kimap {}; kio-admin = callPackage ./kio-admin {}; kio-extras = callPackage ./kio-extras {}; - kio-extras-kf5 = callPackage ./kio-extras-kf5 {}; kio-gdrive = callPackage ./kio-gdrive {}; kio-zeroconf = callPackage ./kio-zeroconf {}; kipi-plugins = callPackage ./kipi-plugins {}; @@ -236,6 +239,7 @@ signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; skanlite = callPackage ./skanlite {}; skanpage = callPackage ./skanpage {}; + skladnik = callPackage ./skladnik {}; spectacle = callPackage ./spectacle {}; step = callPackage ./step {}; svgpart = callPackage ./svgpart {}; diff --git a/pkgs/kde/gear/francis/default.nix b/pkgs/kde/gear/francis/default.nix new file mode 100644 index 000000000000..f17f21c8ea21 --- /dev/null +++ b/pkgs/kde/gear/francis/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "francis"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kalm/default.nix b/pkgs/kde/gear/kalm/default.nix new file mode 100644 index 000000000000..0c4eee90bc31 --- /dev/null +++ b/pkgs/kde/gear/kalm/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kalm"; +} diff --git a/pkgs/kde/gear/katomic/default.nix b/pkgs/kde/gear/katomic/default.nix index 9a0f9b743d9e..e9dcd6ebe040 100644 --- a/pkgs/kde/gear/katomic/default.nix +++ b/pkgs/kde/gear/katomic/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz +}: mkKdeDerivation { pname = "katomic"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "katomic"; } diff --git a/pkgs/kde/gear/kblackbox/default.nix b/pkgs/kde/gear/kblackbox/default.nix index 3f8995ce537e..26156c9195a9 100644 --- a/pkgs/kde/gear/kblackbox/default.nix +++ b/pkgs/kde/gear/kblackbox/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kblackbox"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kblackbox"; } diff --git a/pkgs/kde/gear/kbounce/default.nix b/pkgs/kde/gear/kbounce/default.nix index 8ddeef47bfb6..e93c9e50d673 100644 --- a/pkgs/kde/gear/kbounce/default.nix +++ b/pkgs/kde/gear/kbounce/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kbounce"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kbounce"; } diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index fded9e9b0205..e5df18eb9004 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=", + cargoHash ? "sha256-AMOgchdx9754rkGJg8IdsNgYgH8esnlrreuY5AFZlwE=", }: mkKdeDerivation rec { pname = "kdepim-addons"; diff --git a/pkgs/kde/gear/kfourinline/default.nix b/pkgs/kde/gear/kfourinline/default.nix index 5e1d6fba0ef0..2c77d372fc16 100644 --- a/pkgs/kde/gear/kfourinline/default.nix +++ b/pkgs/kde/gear/kfourinline/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kfourinline"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; } diff --git a/pkgs/kde/gear/kjumpingcube/default.nix b/pkgs/kde/gear/kjumpingcube/default.nix index 1f1daf12d234..0141748b39dc 100644 --- a/pkgs/kde/gear/kjumpingcube/default.nix +++ b/pkgs/kde/gear/kjumpingcube/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kjumpingcube"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kjumpingcube"; } diff --git a/pkgs/kde/gear/klickety/default.nix b/pkgs/kde/gear/klickety/default.nix index 574bddccf00b..339fa31003a5 100644 --- a/pkgs/kde/gear/klickety/default.nix +++ b/pkgs/kde/gear/klickety/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "klickety"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "klickety"; } diff --git a/pkgs/kde/gear/klines/default.nix b/pkgs/kde/gear/klines/default.nix index 58a8f6f8c465..52bb95c0d787 100644 --- a/pkgs/kde/gear/klines/default.nix +++ b/pkgs/kde/gear/klines/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "klines"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "klines"; } diff --git a/pkgs/kde/gear/kmines/default.nix b/pkgs/kde/gear/kmines/default.nix index 5c333ae11da5..687cf0d29480 100644 --- a/pkgs/kde/gear/kmines/default.nix +++ b/pkgs/kde/gear/kmines/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kmines"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kmines"; } diff --git a/pkgs/kde/gear/knavalbattle/default.nix b/pkgs/kde/gear/knavalbattle/default.nix index 3168f2b5729c..abd9281ff52e 100644 --- a/pkgs/kde/gear/knavalbattle/default.nix +++ b/pkgs/kde/gear/knavalbattle/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "knavalbattle"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "knavalbattle"; } diff --git a/pkgs/kde/gear/kolf/default.nix b/pkgs/kde/gear/kolf/default.nix index 51a31e5e753a..39657f077a7d 100644 --- a/pkgs/kde/gear/kolf/default.nix +++ b/pkgs/kde/gear/kolf/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kolf"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kolf"; } diff --git a/pkgs/kde/gear/kollision/default.nix b/pkgs/kde/gear/kollision/default.nix index f8e816437bb4..299549d47513 100644 --- a/pkgs/kde/gear/kollision/default.nix +++ b/pkgs/kde/gear/kollision/default.nix @@ -1,5 +1,11 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + _7zz, +}: mkKdeDerivation { pname = "kollision"; + + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "kollision"; } diff --git a/pkgs/kde/gear/kreversi/default.nix b/pkgs/kde/gear/kreversi/default.nix index facc50b28b15..3f5591c299b6 100644 --- a/pkgs/kde/gear/kreversi/default.nix +++ b/pkgs/kde/gear/kreversi/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "kreversi"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "kreversi"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index eadb9fffb756..3ab41fcc4f51 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -1,28 +1,18 @@ { mkKdeDerivation, - fetchpatch, + pkg-config, qtwayland, libvncserver, + pipewire, xorg, }: mkKdeDerivation { pname = "krfb"; - # Backports. - # FIXME: remove in next release - patches = [ - # Build fix for Qt 6.7.1 - ./fix-build-with-qt-6.7.1.diff - # Wayland crash fix - (fetchpatch { - url = "https://invent.kde.org/network/krfb/-/commit/6e7a5ba56966ea1b67400be9ab7c82885abb76be.diff"; - hash = "sha256-kqD4B2Nixw8KMCOc4RpoEmvII2JZYBPxog6TT/BPuFs="; - }) - ]; - extraCmakeFlags = [ "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraBuildInputs = [qtwayland libvncserver xorg.libXdamage]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; } diff --git a/pkgs/kde/gear/krfb/fix-build-with-qt-6.7.1.diff b/pkgs/kde/gear/krfb/fix-build-with-qt-6.7.1.diff deleted file mode 100644 index d9ee35d4ca00..000000000000 --- a/pkgs/kde/gear/krfb/fix-build-with-qt-6.7.1.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/framebuffers/pipewire/CMakeLists.txt b/framebuffers/pipewire/CMakeLists.txt -index 99f4562..3bf5f63 100644 ---- a/framebuffers/pipewire/CMakeLists.txt -+++ b/framebuffers/pipewire/CMakeLists.txt -@@ -9,11 +9,6 @@ set (krfb_framebuffer_pw_SRCS - screencasting.cpp - ) - --ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw_SRCS -- PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml -- BASENAME zkde-screencast-unstable-v1 --) -- - ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS - HEADER krfb_fb_pipewire_debug.h - IDENTIFIER KRFB_FB_PIPEWIRE -@@ -38,6 +33,18 @@ add_library(krfb_framebuffer_pw - MODULE - ${krfb_framebuffer_pw_SRCS} - ) -+ -+if (Qt6_VERSION VERSION_LESS "6.7.1") -+ ecm_add_qtwayland_client_protocol(krfb_framebuffer_pw -+ PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml -+ BASENAME zkde-screencast-unstable-v1 -+ ) -+else() -+ qt6_generate_wayland_protocol_client_sources(krfb_framebuffer_pw -+ FILES ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml -+ ) -+endif() -+ - set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99) - - target_link_libraries(krfb_framebuffer_pw -diff --git a/framebuffers/pipewire/screencasting.cpp b/framebuffers/pipewire/screencasting.cpp -index 3c4d1ab..c338699 100644 ---- a/framebuffers/pipewire/screencasting.cpp -+++ b/framebuffers/pipewire/screencasting.cpp -@@ -5,7 +5,11 @@ - */ - - #include "screencasting.h" -+#if QT_VERSION < QT_VERSION_CHECK(6, 7, 1) - #include "qwayland-zkde-screencast-unstable-v1.h" -+#else -+#include "qwayland-screencast.h" -+#endif - #include - #include - #include diff --git a/pkgs/kde/gear/ksudoku/default.nix b/pkgs/kde/gear/ksudoku/default.nix index b11d44f488f9..15ac4e2ce4f8 100644 --- a/pkgs/kde/gear/ksudoku/default.nix +++ b/pkgs/kde/gear/ksudoku/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "ksudoku"; extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [_7zz]; + meta.mainProgram = "ksudoku"; } diff --git a/pkgs/kde/gear/kubrick/default.nix b/pkgs/kde/gear/kubrick/default.nix index d5ca09e42887..a194ebae5b68 100644 --- a/pkgs/kde/gear/kubrick/default.nix +++ b/pkgs/kde/gear/kubrick/default.nix @@ -1,11 +1,14 @@ { mkKdeDerivation, qtsvg, + _7zz, libGLU, }: mkKdeDerivation { pname = "kubrick"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg libGLU]; + meta.mainProgram = "kubrick"; } diff --git a/pkgs/kde/gear/lskat/default.nix b/pkgs/kde/gear/lskat/default.nix index 131cb34c0365..eefb95f9e1b4 100644 --- a/pkgs/kde/gear/lskat/default.nix +++ b/pkgs/kde/gear/lskat/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "lskat"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "lskat"; } diff --git a/pkgs/kde/gear/picmi/default.nix b/pkgs/kde/gear/picmi/default.nix index 8838b657bc47..341cd3922aff 100644 --- a/pkgs/kde/gear/picmi/default.nix +++ b/pkgs/kde/gear/picmi/default.nix @@ -1,10 +1,13 @@ { mkKdeDerivation, qtsvg, + _7zz, }: mkKdeDerivation { pname = "picmi"; + extraNativeBuildInputs = [_7zz]; extraBuildInputs = [qtsvg]; + meta.mainProgram = "picmi"; } diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix index b6db869472cf..c855041220c9 100644 --- a/pkgs/kde/gear/skanpage/default.nix +++ b/pkgs/kde/gear/skanpage/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + qtwebengine, tesseractLanguages ? [], tesseract5, leptonica, @@ -8,6 +9,7 @@ mkKdeDerivation { pname = "skanpage"; extraBuildInputs = [ + qtwebengine (tesseract5.override {enableLanguages = tesseractLanguages;}) leptonica ]; diff --git a/pkgs/kde/gear/skladnik/default.nix b/pkgs/kde/gear/skladnik/default.nix new file mode 100644 index 000000000000..ae4dd03f3e3c --- /dev/null +++ b/pkgs/kde/gear/skladnik/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "skladnik"; +} diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/gear/spectacle/default.nix index 3232b6402bd0..576c2de08a5e 100644 --- a/pkgs/kde/gear/spectacle/default.nix +++ b/pkgs/kde/gear/spectacle/default.nix @@ -2,10 +2,11 @@ mkKdeDerivation, qtwayland, qtmultimedia, + opencv, }: mkKdeDerivation { pname = "spectacle"; - extraBuildInputs = [qtwayland qtmultimedia]; + extraBuildInputs = [qtwayland qtmultimedia opencv]; meta.mainProgram = "spectacle"; } diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index 5b3e4359cf94..82ecdcb4cd95 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -1,4 +1,13 @@ { + "accessibility-inspector": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], "akonadi": [ "BSD-3-Clause", "CC0-1.0", @@ -159,6 +168,11 @@ "LGPL-3.0-only", "LicenseRef-KDE-Accepted-LGPL" ], + "audex": [ + "CC0-1.0", + "GPL-3.0-or-later", + "LGPL-2.0-or-later" + ], "audiocd-kio": [ "BSD-3-Clause", "CC0-1.0", @@ -255,9 +269,11 @@ "CC0-1.0" ], "breeze-icons": [ + "CC-BY-SA-4.0", "CC0-1.0", "LGPL-2.0-or-later", "LGPL-2.1-only", + "LGPL-2.1-or-later", "LGPL-3.0-only", "LicenseRef-KDE-Accepted-LGPL" ], @@ -331,8 +347,7 @@ ], "dolphin-plugins": [ "CC0-1.0", - "GPL-2.0-or-later", - "MIT" + "GPL-2.0-or-later" ], "dragon": [ "CC0-1.0", @@ -413,6 +428,14 @@ "LGPL-3.0-only", "LicenseRef-KDE-Accepted-LGPL" ], + "francis": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], "ghostwriter": [ "Apache-2.0", "BSD-3-Clause", @@ -527,6 +550,11 @@ "GPL-2.0-or-later", "GPL-3.0-or-later" ], + "kalm": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.1-or-later" + ], "kalzium": [ "BSD-3-Clause", "CC0-1.0", @@ -1266,23 +1294,6 @@ "LicenseRef-KDE-Accepted-LGPL", "MIT" ], - "kio-extras-kf5": [ - "BSD-2-Clause", - "BSD-3-Clause", - "CC0-1.0", - "GPL-2.0-only", - "GPL-2.0-or-later", - "GPL-3.0-only", - "GPL-3.0-or-later", - "LGPL-2.0-only", - "LGPL-2.0-or-later", - "LGPL-2.1-only", - "LGPL-2.1-or-later", - "LGPL-3.0-only", - "LicenseRef-KDE-Accepted-GPL", - "LicenseRef-KDE-Accepted-LGPL", - "MIT" - ], "kio-gdrive": [ "CC0-1.0", "GPL-2.0-only", @@ -1301,6 +1312,7 @@ "CC0-1.0" ], "kirigami": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "FSFAP", @@ -1419,10 +1431,12 @@ "Qt-Commercial-exception-1.0" ], "kmail-account-wizard": [ - "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", - "LGPL-2.0-or-later" + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" ], "kmailtransport": [ "BSD-3-Clause", @@ -1470,6 +1484,7 @@ "GPL-2.0-or-later" ], "knavalbattle": [ + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later" ], @@ -1533,6 +1548,7 @@ "LicenseRef-KDE-Accepted-LGPL" ], "kolf": [ + "BSD-3-Clause", "CC0-1.0" ], "kollision": [ @@ -1610,7 +1626,6 @@ "BSD-3-Clause", "CC-BY-SA-4.0", "CC0-1.0", - "GPL-3.0-only", "GPL-3.0-or-later" ], "konversation": [ @@ -1938,6 +1953,7 @@ "GPL-2.0-or-later" ], "kubrick": [ + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later" ], @@ -2360,7 +2376,6 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", - "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.0-or-later", "LicenseRef-KDE-Accepted-GPL", @@ -2397,7 +2412,8 @@ "GPL-2.0-or-later", "GPL-3.0-only", "LGPL-2.1-or-later", - "LicenseRef-KDE-Accepted-GPL" + "LicenseRef-KDE-Accepted-GPL", + "MIT" ], "partitionmanager": [ "CC-BY-4.0", @@ -2705,7 +2721,8 @@ "LGPL-3.0-only", "LicenseRef-KDE-Accepted-LGPL", "LicenseRef-KFQF-Accepted-GPL", - "LicenseRef-Qt-Commercial" + "LicenseRef-Qt-Commercial", + "MIT" ], "rocs": [ "BSD-2-Clause", @@ -2741,6 +2758,13 @@ "GPL-3.0-only", "LicenseRef-KDE-Accepted-GPL" ], + "skladnik": [ + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GFDL-1.2-or-later", + "GPL-2.0-or-later" + ], "solid": [ "BSD-3-Clause", "CC0-1.0", diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index 96499269a4d1..3f59e4f7e162 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1232 +1,1252 @@ { + "accessibility-inspector": { + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/accessibility-inspector-24.05.0.tar.xz", + "hash": "sha256-bIgwqq3GEN0UEqT+Qo1ETE5aP5/k4c0DftkzTwZG6pg=" + }, "akonadi": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-24.02.2.tar.xz", - "hash": "sha256-G3kjaVbz10BL0j3JBz4RK1NWpkFW5PvDJMQJwTJb80M=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-24.05.0.tar.xz", + "hash": "sha256-6YGDb7POV0he07XE7UYTG8EsDUzXw3jYy2KPnF9TjZk=" }, "akonadi-calendar": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-calendar-24.02.2.tar.xz", - "hash": "sha256-kwGV5yLPJowUZa41Nmq+++bw02o/cnCNDLAi5iiK6Fk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-calendar-24.05.0.tar.xz", + "hash": "sha256-Lv05KE6p2+Y86dSpbmIFUlA3DLA4kxn1h6mw7P9I0tY=" }, "akonadi-calendar-tools": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-calendar-tools-24.02.2.tar.xz", - "hash": "sha256-dbbLxrznmjtUpdLJR6FNWR6BIgpey8QpTo5JMOYJsDc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-calendar-tools-24.05.0.tar.xz", + "hash": "sha256-qjMkoAvmG5p6ACGzznGgyrMMmt6PyPidJFHp9vqj5UI=" }, "akonadiconsole": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadiconsole-24.02.2.tar.xz", - "hash": "sha256-6KXlu1fRMkX8pLxr8b3f8ZJDb/7+gjUfSVb317l8ObQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadiconsole-24.05.0.tar.xz", + "hash": "sha256-81/2NI3rvTAnH0HXPT8DZXoZVnOP8phBcyhrRIGU3ZE=" }, "akonadi-contacts": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-contacts-24.02.2.tar.xz", - "hash": "sha256-7/C8KnAVgEE32cMvTCAQDKEeX5SosRkVPNBi67BW9R8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-contacts-24.05.0.tar.xz", + "hash": "sha256-8AMhc0SVJHe3399XoL2iPKFzpS7O90jTFyPFkwn+2UI=" }, "akonadi-import-wizard": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-import-wizard-24.02.2.tar.xz", - "hash": "sha256-+VCKPaYySF9mM4fP2DKtanZ+r/IIa6Y+AQowNE+dXxU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-import-wizard-24.05.0.tar.xz", + "hash": "sha256-L1cHleGkV/dRQi7kP12tJEebCa42mfoVr2YP270hZY0=" }, "akonadi-mime": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-mime-24.02.2.tar.xz", - "hash": "sha256-sGUWJr2lOgujbIBE0RRyOcxVHvAO7R3/+DiKFm0c5BM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-mime-24.05.0.tar.xz", + "hash": "sha256-plgg19J1B5tHnLIPD8UW9Z+EbCm13NConTNQxpcoAPw=" }, "akonadi-notes": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-notes-24.02.2.tar.xz", - "hash": "sha256-BATXrYrse4g4s5CdnPIi0mf01vO1Hya9jsyjmn2LWFU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-notes-24.05.0.tar.xz", + "hash": "sha256-mXb2bmDAvKJaezPuyHEfQ8FKl9seZZzeqRSWjtJDGZA=" }, "akonadi-search": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akonadi-search-24.02.2.tar.xz", - "hash": "sha256-bPrMpULzFzrS+TuqCPu3ddE5AqG6UAV+Ex9IZr6mK54=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akonadi-search-24.05.0.tar.xz", + "hash": "sha256-2VsVGQ+MP20yBYY2JnPPI5r9NJxXyOApLJgrc03H410=" }, "akregator": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/akregator-24.02.2.tar.xz", - "hash": "sha256-lGd55Rup4KrkF6DXTCmFXWfUYVCKejSyZOpY1zdqymo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/akregator-24.05.0.tar.xz", + "hash": "sha256-qV+n9eHq0k5Wx7UAxf3+MRGZVITBgd64E7MAIhIJm7M=" }, "alligator": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/alligator-24.02.2.tar.xz", - "hash": "sha256-ridOcusOuZdfGTyCNUQkQW58yeLZ/Xe1efVPsqs/7VU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/alligator-24.05.0.tar.xz", + "hash": "sha256-RziRlNQfGV4bI9iwq4gxXz0gceI1KWJlndMybPfzxeU=" }, "analitza": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/analitza-24.02.2.tar.xz", - "hash": "sha256-SdYM5D277bBHooHdLfaigY2Ok0B3R0nQeqelYj9szJs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/analitza-24.05.0.tar.xz", + "hash": "sha256-tJqBTcQdPr6ydXmqk2wMtNt8SXYkhle5IBj5mWFlRbo=" }, "angelfish": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/angelfish-24.02.2.tar.xz", - "hash": "sha256-XTqwdHOUKLbTD2oS1oOgXxDf9h9UOwU59aGaFfxMg/E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/angelfish-24.05.0.tar.xz", + "hash": "sha256-yltDFftPP2VisEXy8xJBzo/1x7vgyrgMU0lC3804Cnw=" }, "arianna": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/arianna-24.02.2.tar.xz", - "hash": "sha256-NymiP5TSN5+1h/6QBDb/uSygOuMClu6le5YlqbS+uz4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/arianna-24.05.0.tar.xz", + "hash": "sha256-OV+WXxeItC+vFcXb0YyU/+Br+QJgIrupCH+YxpYAsoQ=" }, "ark": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ark-24.02.2.tar.xz", - "hash": "sha256-BjdPXHwq7nqTwEv9e2s7quqzli6Cd8kIf+pUupgFvc4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ark-24.05.0.tar.xz", + "hash": "sha256-cLFJ8CJutATJ2VeXHoapS8TAccGqGk0jPEkeX9tj+dc=" }, "artikulate": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/artikulate-24.02.2.tar.xz", - "hash": "sha256-di0yr7ij+PilNs4zpyCIjr2ZZ7T7/qineSWj7QBDuzo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/artikulate-24.05.0.tar.xz", + "hash": "sha256-kUBnBKcxXXvlnYQ0i4W+MAag4tagtbbmVdy09rQs9Rk=" + }, + "audex": { + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/audex-24.05.0.tar.xz", + "hash": "sha256-WBCMw/Gm4QwhvRXEQ7/zBLLWUkCiW5jFTcSHsNEYfOk=" }, "audiocd-kio": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/audiocd-kio-24.02.2.tar.xz", - "hash": "sha256-ig/BKoaU7MiSO1RcXKsgYgQEvXe4SoDkt0yAq05XWho=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/audiocd-kio-24.05.0.tar.xz", + "hash": "sha256-V07l2An23i6L7F7cMYqzD5AdD7FWYApap9Jdrw2/MnQ=" }, "audiotube": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/audiotube-24.02.2.tar.xz", - "hash": "sha256-/XIaC46IllW6tZBmtygIBxt2Dr7P8b5H9a36dDqqXjI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/audiotube-24.05.0.tar.xz", + "hash": "sha256-zxlGHbImtub20p5OSswgI/Y4GYKjtz24h31TwgTlo7c=" }, "baloo-widgets": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/baloo-widgets-24.02.2.tar.xz", - "hash": "sha256-J2tVfDY9o2fRxpUOsOGrLK44mqt7U9r2qeJDH4fe6hU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/baloo-widgets-24.05.0.tar.xz", + "hash": "sha256-PSHv1kHCt83uzrxKS5OM3TtPPIfMJgAU49pxHSKp9rc=" }, "blinken": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/blinken-24.02.2.tar.xz", - "hash": "sha256-hdwL/bbA2n7/s2q2QS8OvTzLndjn53X0y0HAC2/4VmY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/blinken-24.05.0.tar.xz", + "hash": "sha256-WL0Nxy0g5w0tJQFRjm4QzJ7D+pwCSqbQmnsoylWEKEQ=" }, "bomber": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/bomber-24.02.2.tar.xz", - "hash": "sha256-uhke2hB/YF+j7IvjEZtrPQcqV2EBJ5xPa0vg0Be4l1c=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/bomber-24.05.0.tar.xz", + "hash": "sha256-4xJmlRR71hA4/SuRH3sEoKZDRS29N4333uAG0wjtgi0=" }, "bovo": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/bovo-24.02.2.tar.xz", - "hash": "sha256-oFIrL6rOogHqfpDFrarfNE8lf13s/EQUBwhIrLeKx4g=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/bovo-24.05.0.tar.xz", + "hash": "sha256-09EavFONoctc28o5mtDfoGTjlaO8PsKGDGu2x+tB0SU=" }, "calendarsupport": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/calendarsupport-24.02.2.tar.xz", - "hash": "sha256-kGZxMgtfMr2e3PIS5moWxUbRlhUL0zMKr4qwkxsLBzE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/calendarsupport-24.05.0.tar.xz", + "hash": "sha256-UMhbZlrZ7zt6UUIWrdUmX78kI2I3kmdUmj7XI4SMvMc=" }, "calindori": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/calindori-24.02.2.tar.xz", - "hash": "sha256-oPvoWm2TPJ0HlLVWzzdlGTlCS4+7bdMwjHNrqAcx5H8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/calindori-24.05.0.tar.xz", + "hash": "sha256-E1nOyaeKLlLJMP3PmfmSN/W59Rpao2+boI8F4p0G9jY=" }, "cantor": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/cantor-24.02.2.tar.xz", - "hash": "sha256-HNY0Thm1fsmMEDUGkg3kEqVUG2E3fEPctRYq45wrm/U=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/cantor-24.05.0.tar.xz", + "hash": "sha256-dREEXdoQIOd3m23O+/lPYRWu/h+N6iLipYzQrArh4aI=" }, "cervisia": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/cervisia-24.02.2.tar.xz", - "hash": "sha256-+pGS/G/ZtLqH/8mlzF8n3+7+1/OuZ6DYoyRYBdTw5Cs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/cervisia-24.05.0.tar.xz", + "hash": "sha256-+5uo9rzp3OmUnUh8Z7qDcfqC/wudTKenh0FFMKrzmZI=" }, "colord-kde": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/colord-kde-24.02.2.tar.xz", - "hash": "sha256-wzuEuILOv3pzm/R7J4+QLhRFBHDTCpYJGJfH1Hh1eEA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/colord-kde-24.05.0.tar.xz", + "hash": "sha256-lJGSTIvMCJpkzdT2hLa3gx7wU5l5XrKxCUIOsezV3HU=" }, "dolphin": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/dolphin-24.02.2.tar.xz", - "hash": "sha256-UIREkNRRWcoWwdjZ9fBwHxGHcuSwmtrScINbZ7smpwE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/dolphin-24.05.0.tar.xz", + "hash": "sha256-4AnOc0NVSBoI//8T5van24trdPoyADCzXZGAodnKB5Q=" }, "dolphin-plugins": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/dolphin-plugins-24.02.2.tar.xz", - "hash": "sha256-FLqewFaFXgEMzpzYyxTieIKHGZ8cyPUugKLUpLjFCw0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/dolphin-plugins-24.05.0.tar.xz", + "hash": "sha256-cVMp916yLW9ZuqvF3voao3xz6hbWIUHA6uaVMlwBrC4=" }, "dragon": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/dragon-24.02.2.tar.xz", - "hash": "sha256-L/hf4lWnbUmCWSUSkDaQ4W5FLdzWSbbccCScBV9Nz5g=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/dragon-24.05.0.tar.xz", + "hash": "sha256-tOghEE07tjv71E9t03FBtCPmTOXbLU6VkVIUhgFQ34s=" }, "elisa": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/elisa-24.02.2.tar.xz", - "hash": "sha256-CCGLpznqCs6Cu6aqmFdYFNz99p/rYVljmPXTN8KVbA8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/elisa-24.05.0.tar.xz", + "hash": "sha256-LTdxJcs0MteiILDpBxMzSOZ9JRyM2mDCXgS7oNJOjfc=" }, "eventviews": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/eventviews-24.02.2.tar.xz", - "hash": "sha256-UqyX3NJw4uDBOJtx+XRXSSMw1Mn15GpNi3ZbaV6PVe0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/eventviews-24.05.0.tar.xz", + "hash": "sha256-gDNR57hV+heQ6/wemOqzRftrcFWNSvl7N6o0QEAleR8=" }, "falkon": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/falkon-24.02.2.tar.xz", - "hash": "sha256-+GB4MNmXWfVTNq19jo87+d+WlstWMqTjCFhuiSDX6cs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/falkon-24.05.0.tar.xz", + "hash": "sha256-kggxPYiw9fuoTnfpn0KNgr3j04A5uPEmIAMsdeZEkZ0=" }, "ffmpegthumbs": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ffmpegthumbs-24.02.2.tar.xz", - "hash": "sha256-COjDKHOkm25liGrVAdMl+AUyQMZojAg1NIKDE/YMJFo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ffmpegthumbs-24.05.0.tar.xz", + "hash": "sha256-ozfE8ZwTPvRyt8Nk1IEtl5wHi1WaUbnH1t8aoeynBGc=" }, "filelight": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/filelight-24.02.2.tar.xz", - "hash": "sha256-FVG9/ef8fkI0xmU9WmE4+e/vyei97aqqaDNUcoNou44=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/filelight-24.05.0.tar.xz", + "hash": "sha256-DHdv8NsyPUffuWdyzvY7IxHs7t6UBJSUOw8+i/ipq4w=" + }, + "francis": { + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/francis-24.05.0.tar.xz", + "hash": "sha256-Zkf1VmCx0MMlwNWqPaUW8ArO0Pe2V6fSu/pqoF1y3/M=" }, "ghostwriter": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ghostwriter-24.02.2.tar.xz", - "hash": "sha256-Ct8M7/UWNvXnM5H+MzXiY8Whdw68hmLxSgNGpm26F04=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ghostwriter-24.05.0.tar.xz", + "hash": "sha256-rhuCZBfcUK8b26igOsuGzqpjDEs+0L9tPIEW0NT2XDg=" }, "granatier": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/granatier-24.02.2.tar.xz", - "hash": "sha256-H2wCX633JVAYC8Nrv4E1sHJGaIkEv9ehxm+QCDLSvck=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/granatier-24.05.0.tar.xz", + "hash": "sha256-scZmT4fQo8dna2PKxHcuHlAJvHVrirjlAzDdcglx3ZY=" }, "grantlee-editor": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/grantlee-editor-24.02.2.tar.xz", - "hash": "sha256-M1l1Rt2dTwnPDq1Oy04SaT9qg71CTjB2g+THRBL1JnA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/grantlee-editor-24.05.0.tar.xz", + "hash": "sha256-Zqns6Adbiivzzz0IYY2YIjqVShr3ykVWpg7fTvCJFB8=" }, "grantleetheme": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/grantleetheme-24.02.2.tar.xz", - "hash": "sha256-VIlfJVFtJ0xL/PfPWRCdXNLj9602GZaKflSnOn61qVg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/grantleetheme-24.05.0.tar.xz", + "hash": "sha256-uo55sP1GAHTfufJM7ftgbDyL3lkB4oM0lnlgd28pJ5g=" }, "gwenview": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/gwenview-24.02.2.tar.xz", - "hash": "sha256-XxhgQHb+4pfnIutd1PRZafDgDGXs6TnnsSRj9X33i54=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/gwenview-24.05.0.tar.xz", + "hash": "sha256-se2CcMpPeWfHY2lnoYqLm/FyiXD2z4p+EbQj0Lzq5LA=" }, "incidenceeditor": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/incidenceeditor-24.02.2.tar.xz", - "hash": "sha256-L+I9hvAy5ZyXolpEPmzwpe3hNGnKGcbI1TMFjeZUJRc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/incidenceeditor-24.05.0.tar.xz", + "hash": "sha256-K6hYRgMfoOVcO+9Zds6kTE9tXFyPmeeysaqO4CHhGCo=" }, "isoimagewriter": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/isoimagewriter-24.02.2.tar.xz", - "hash": "sha256-lsddWNFO9ySQ2tSrYrcr9aedXNkCns+noonfGoP4sYY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/isoimagewriter-24.05.0.tar.xz", + "hash": "sha256-Nl9mo+qPKx9sjAn4fyiT7Gc3r5bldQE2Q1WGVa3lAeE=" }, "itinerary": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/itinerary-24.02.2.tar.xz", - "hash": "sha256-eCGsmCUwFlshH0633jIl3rdn7TVrxQUXbcNkDoVMOxw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/itinerary-24.05.0.tar.xz", + "hash": "sha256-tjHIF54+pT9I1opIWDRwovlKR108iTcl6NJB99dvlxs=" }, "juk": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/juk-24.02.2.tar.xz", - "hash": "sha256-5XHlttb7Jz9Ar+8bX7KTO2OtuRcNEoI9EXWHn/sr+oM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/juk-24.05.0.tar.xz", + "hash": "sha256-mExAW9VQcXbyvDEyTbloe23e5MpS6bN9vSeXj4yuV3M=" }, "k3b": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/k3b-24.02.2.tar.xz", - "hash": "sha256-YEfZQZO6FlDOcfQQC7oHhgI0VfTGoS4UydVDBYpOjkU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/k3b-24.05.0.tar.xz", + "hash": "sha256-jgxH9vLI08LjiV3I6bAgWxqM4DcpOyDEfNN9QkZFOtA=" }, "kaccounts-integration": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kaccounts-integration-24.02.2.tar.xz", - "hash": "sha256-1Qs9eQ2N9qJNGv52YPp8bmHDgVnXdzgPh7gTyR0G0wc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kaccounts-integration-24.05.0.tar.xz", + "hash": "sha256-jyAiwel9Wg0FSqtzpzjVatJYAK/xRcyDf/ZcqVAmw+g=" }, "kaccounts-providers": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kaccounts-providers-24.02.2.tar.xz", - "hash": "sha256-Ti9uioVPthqxnwD4/2dsj9l7GhK3BIXmZSt0r6N0nBg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kaccounts-providers-24.05.0.tar.xz", + "hash": "sha256-Mrsh0NrLjblfss2WUSkPBODZGs2ttGdj7sqBs1G0WEo=" }, "kaddressbook": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kaddressbook-24.02.2.tar.xz", - "hash": "sha256-9ujQeY+Wf0XpJ5j2iUQ3XY0IjajDP2UAyk6mCxdH76M=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kaddressbook-24.05.0.tar.xz", + "hash": "sha256-sdJ9+HX1rBe5lr3GaK80BYLcI1hSs1ikdfAC8YUkE1E=" }, "kajongg": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kajongg-24.02.2.tar.xz", - "hash": "sha256-wj6afAznRNhX5W5GtoVqyDRF9yzLYYPo6Xfw5aOCRT8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kajongg-24.05.0.tar.xz", + "hash": "sha256-X0Ie68zuj3au6yjEXr6n1lZ2lMem9/ryPzbOXxVOoXI=" }, "kalarm": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kalarm-24.02.2.tar.xz", - "hash": "sha256-LrlXBP+sQ6O96UISGmOm/zp/We54P8YU6w0CFuV4b/4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kalarm-24.05.0.tar.xz", + "hash": "sha256-uLSs/UUR3rHQS/zzwX/DmVpK03NI4/rpR+RJmcShDWY=" }, "kalgebra": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kalgebra-24.02.2.tar.xz", - "hash": "sha256-oFvJWvkuRduH56GKkH5H9WsbiRtb2C9h7QFVs9rzTug=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kalgebra-24.05.0.tar.xz", + "hash": "sha256-v46chi9OKDCQ8BMpnv++WVQeQD+ciL4rr++SgiS0hWI=" }, "kalk": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kalk-24.02.2.tar.xz", - "hash": "sha256-i85J/DofNyYDlroZfA0K/6YMIFFiSwVbRzakfmcJUWM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kalk-24.05.0.tar.xz", + "hash": "sha256-EZlYtQ1uEDshnBE4Gp9makx/UJAAw1/zOqiqWsZDAJE=" + }, + "kalm": { + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kalm-24.05.0.tar.xz", + "hash": "sha256-VZmdWHLntFafXDG4k/GfkaL98Niai6Tmctm2nkWhurY=" }, "kalzium": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kalzium-24.02.2.tar.xz", - "hash": "sha256-TGwX7FhH23FMEaJJ3kWZ1B3In8BLo4E53JCn/hX/Fqs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kalzium-24.05.0.tar.xz", + "hash": "sha256-uB3/bjzuQL21jAopa7Drn0abYHMW+I5gQg37KjK5n4Y=" }, "kamera": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kamera-24.02.2.tar.xz", - "hash": "sha256-5ZTVkaqrHz3V+uzwJtd8DX7gJcNmL3xV50NGCM7bVNQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kamera-24.05.0.tar.xz", + "hash": "sha256-txJ4zgq0QhI3OkPRZVPPqZtAf3GmxpIJxTb3BKJTkG8=" }, "kamoso": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kamoso-24.02.2.tar.xz", - "hash": "sha256-f9cuA5hFh9mKGGeWCtqcOkTnyWjFSG/HdWP507tdCWs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kamoso-24.05.0.tar.xz", + "hash": "sha256-ARJD3hrvogP3hRDXXrUSjBve5DXUURemQu/ib5miCQ4=" }, "kanagram": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kanagram-24.02.2.tar.xz", - "hash": "sha256-s5rbg39f78IFPRocFfpVHgVOohR6AVxGGRTZyvyeR1w=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kanagram-24.05.0.tar.xz", + "hash": "sha256-x+3GgldPSGxKrdwEaDNtg4/fvvM779ajr80W2eplHZ8=" }, "kapman": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kapman-24.02.2.tar.xz", - "hash": "sha256-3j0LLttJQQXXOdR9eCUkJSO36M2M5VGpUNQDfm4+eeo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kapman-24.05.0.tar.xz", + "hash": "sha256-cng9BQIOWHTzleo/ujdc1Lh64d/HBpatkhJtv40503M=" }, "kapptemplate": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kapptemplate-24.02.2.tar.xz", - "hash": "sha256-wrv56L0aZjynOEffETrZVQu4QT5MCBO1B54Bp0hjo1o=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kapptemplate-24.05.0.tar.xz", + "hash": "sha256-jQoJkyQ35ndHfSp9zqC2HTLFvv5v6q6tqIPx1mg4Vg4=" }, "kasts": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kasts-24.02.2.tar.xz", - "hash": "sha256-Tcf2XvflSBY9V6vAfRSStu0ca2RQgKJoYUsEjIICCN8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kasts-24.05.0.tar.xz", + "hash": "sha256-+h7PGExxrLiLGYPWscctgS4s88k3zMefyIXel8uLYII=" }, "kate": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kate-24.02.2.tar.xz", - "hash": "sha256-HdrLCTmDGkPiucGr2Nflr+/nZ4mEIzMmNlU3Dpn1Q00=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kate-24.05.0.tar.xz", + "hash": "sha256-0txf3wmQaNMVvpVi0zTJgMgO9t9810AAE6vDjUpO1iY=" }, "katomic": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/katomic-24.02.2.tar.xz", - "hash": "sha256-5tIIENASeTWZtY6FCzZKgl6R1nnOb28xwPX+4+ar2aA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/katomic-24.05.0.tar.xz", + "hash": "sha256-0eUpr6OrhbrkfkhEjhe4+wuXF/DV8TWX8UD08mi3Jhw=" }, "kbackup": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kbackup-24.02.2.tar.xz", - "hash": "sha256-Amcdci6yJESCj3qZNqtEmdavnaS8ea6zOHAR3TclcVg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kbackup-24.05.0.tar.xz", + "hash": "sha256-nV8wwRsNjujMHwyx/+SxWr9H5OIwvNIDmzulpxFYvm8=" }, "kblackbox": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kblackbox-24.02.2.tar.xz", - "hash": "sha256-NTTlrAQPxCf/PlBF8ZkAPDpDq7H7YZfRnvsPblAgAPY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kblackbox-24.05.0.tar.xz", + "hash": "sha256-LVmBnbzXQKpQ/lrheOHZm7eGODp6uleZIFwbR2DebIA=" }, "kblocks": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kblocks-24.02.2.tar.xz", - "hash": "sha256-rOcasBtCOHtrxJhypwg9c4pvHAhMeli1c6Tx8ZCKkGM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kblocks-24.05.0.tar.xz", + "hash": "sha256-t8ahzvjxMLBDYxBTcfdzvVUcivwOaPj99J2CEA9CtOg=" }, "kbounce": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kbounce-24.02.2.tar.xz", - "hash": "sha256-g9AImDCZw2BwG7EJ3/myZAsQ3KQfhk6CD1nvX3C9qqY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kbounce-24.05.0.tar.xz", + "hash": "sha256-pNrXWpi5MT8gsRi4+6Fgjl2JHKSrZOVDuhwOJ1zgRV0=" }, "kbreakout": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kbreakout-24.02.2.tar.xz", - "hash": "sha256-lEMvZ0NGPhx06rZr1+kaKDs1xHGi0DwOtLYZz95Y21M=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kbreakout-24.05.0.tar.xz", + "hash": "sha256-k7vN0m5jmRre7UUG6dM4qNNdSAwBTDIYmCRKmKXcYUs=" }, "kbruch": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kbruch-24.02.2.tar.xz", - "hash": "sha256-mwAEF9T5epRyDKzaKrffIAAEv4LggtPUB83DvYeKd+I=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kbruch-24.05.0.tar.xz", + "hash": "sha256-ZcA/oALhG2KSr9X/AYc7HG+1Y2DC/128LF0oDZotDrg=" }, "kcachegrind": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcachegrind-24.02.2.tar.xz", - "hash": "sha256-HEMJn6QqOJ6f+SYTtVDmYGqd6dW1ehCksIq1E+Wme5w=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcachegrind-24.05.0.tar.xz", + "hash": "sha256-IrGVjPw+pjXgisUiR+NffSDPrqQceujWUpfz5PBafLM=" }, "kcalc": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcalc-24.02.2.tar.xz", - "hash": "sha256-nMLSdjX4WK+3vzD55+m+8sBN6mU+4zuqQxZdo+V5e50=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcalc-24.05.0.tar.xz", + "hash": "sha256-oGCRgcWtzdTe02/MYYXlCZqXqxOEZUP1gcBODHuqiWQ=" }, "kcalutils": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcalutils-24.02.2.tar.xz", - "hash": "sha256-ikf/BefvIY4qSDbY2xYoDvYx6bkNm13/jFakzK6NHI0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcalutils-24.05.0.tar.xz", + "hash": "sha256-jG+ZL3Y2LVQJ/Sij6Z1cNtozIDQNcOCWycZuZruQFy0=" }, "kcharselect": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcharselect-24.02.2.tar.xz", - "hash": "sha256-oYVEVRN8xl9518cQJGwWv9DdVYMbocH88hRuiR4p/SU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcharselect-24.05.0.tar.xz", + "hash": "sha256-zpEnS2Yi+K/7FaXCnUn55Fh1v87QGX4EWw2bOf4vbNA=" }, "kclock": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kclock-24.02.2.tar.xz", - "hash": "sha256-mumHKzXstbCLnonGe42zi+qYVJT0YC6Y7j90AQbtYFo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kclock-24.05.0.tar.xz", + "hash": "sha256-lt6+BetBGLpKgGTkNXx11UcWrQ1+S7a5aykb6tyOucY=" }, "kcolorchooser": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcolorchooser-24.02.2.tar.xz", - "hash": "sha256-fx18e/2oDPYnpyvrYtCUTgUoc/SIBO6ZquwTORmABaw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcolorchooser-24.05.0.tar.xz", + "hash": "sha256-5GwL6UWMIyohBekWXY38WCSZ97BywSNO9lc5ZXu6K6U=" }, "kcron": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kcron-24.02.2.tar.xz", - "hash": "sha256-LFWHivRYz8e4PM9ZLaVxc2kywn2CQSBDMZtx7rrXELU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kcron-24.05.0.tar.xz", + "hash": "sha256-JlkNn7fP+SKKKxTcuCTX4i2GwKQgQtbJkk/a2/Dvsj4=" }, "kdebugsettings": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdebugsettings-24.02.2.tar.xz", - "hash": "sha256-D/ClEQy1i4EhaMtit5+2bj60W9iLfKWBEdXjhk7PukA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdebugsettings-24.05.0.tar.xz", + "hash": "sha256-2cH4lRc9Ea1yZlBHgTB0eBAGvawIaMn6DxWbPZ7D+oE=" }, "kdeconnect-kde": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdeconnect-kde-24.02.2.tar.xz", - "hash": "sha256-6ASRDSse1PX2zjaRXHnRHFW+bO4PJl2SNNlqLCcADa0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdeconnect-kde-24.05.0.tar.xz", + "hash": "sha256-sF9e4WQWCn/6oSaaJ/0qVQBt0An2bGvxBTC84tnZgM0=" }, "kde-dev-scripts": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kde-dev-scripts-24.02.2.tar.xz", - "hash": "sha256-/pmwM1oKsrD/CbMx/CQD+tpm5jfv1RV3rSGgpAEJGd8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kde-dev-scripts-24.05.0.tar.xz", + "hash": "sha256-hXPP528NycSczNGjDDXSqGSFuZswkF3ZU6i3iEcslN8=" }, "kde-dev-utils": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kde-dev-utils-24.02.2.tar.xz", - "hash": "sha256-qmb4jZJxiqcpxkStN8aS4AWmMZBSihQgGRUhMpvb3U4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kde-dev-utils-24.05.0.tar.xz", + "hash": "sha256-SbAzghe1hnDkPT2uXhMPLrn1Jdl/3IUtndBPmTUEEIk=" }, "kdeedu-data": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdeedu-data-24.02.2.tar.xz", - "hash": "sha256-Vr/rOVLH2SF/q9iT/y/ae/JZq+FYMQWGxugSsIu4tJc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdeedu-data-24.05.0.tar.xz", + "hash": "sha256-a95Vz3WHKzn2NOOc5NK/D1hoLnoHNMfssOnCY2h+lqM=" }, "kdegraphics-mobipocket": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdegraphics-mobipocket-24.02.2.tar.xz", - "hash": "sha256-kRFWFg5KwC8wJhGN4/MAiWIw+OCmvXp/z1yVvEFsvSo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdegraphics-mobipocket-24.05.0.tar.xz", + "hash": "sha256-cJRngpwbnZ90ZUm9OniUgkIpwKpjBS+2b4ZeKne1rAQ=" }, "kdegraphics-thumbnailers": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdegraphics-thumbnailers-24.02.2.tar.xz", - "hash": "sha256-uWkSy0maO1FOF1X5ILeqJRsVQhL8PD+JS4SrQJ+68wo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdegraphics-thumbnailers-24.05.0.tar.xz", + "hash": "sha256-UyXO4TJb9WSwcGfWpmZYXRrHh0Eoj0X2KPXtQnCBYQw=" }, "kde-inotify-survey": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kde-inotify-survey-24.02.2.tar.xz", - "hash": "sha256-UG1tomYst8jhNduD/xH+TlaW3SWKnTohK11K0oiTCKw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kde-inotify-survey-24.05.0.tar.xz", + "hash": "sha256-25+lq2Zkqy7g6v7uXJZn6RfSjh+sArzObSwlKUN9eb8=" }, "kdenetwork-filesharing": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdenetwork-filesharing-24.02.2.tar.xz", - "hash": "sha256-tRZnIIALHodp0heF6DreLmcw5y/6HMPZMN9kVyLAing=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdenetwork-filesharing-24.05.0.tar.xz", + "hash": "sha256-BKfZHnEGsLngG3Qu2fy1yMX+fhR8sPw/a+wDU/nMp7s=" }, "kdenlive": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdenlive-24.02.2.tar.xz", - "hash": "sha256-yEtiZK7y6nlOAwGCf0bAHhK22VkhWJN+GE3dxMOUbuM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdenlive-24.05.0.tar.xz", + "hash": "sha256-2Eik0zEgs56B5sJ52gkdITuT17/JqlcnSiU6c0CWaK4=" }, "kdepim-addons": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdepim-addons-24.02.2.tar.xz", - "hash": "sha256-sdnub88kEAlOH+R9j4OQ6SCVNwuoJhEZP8PmH1qwST8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdepim-addons-24.05.0.tar.xz", + "hash": "sha256-A4ezYKpPHBRGFyjZXU8ltgiHS+PagS3/Ikz77r+OjvQ=" }, "kdepim-runtime": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdepim-runtime-24.02.2.tar.xz", - "hash": "sha256-7DAF62M58uU+iSaKXh1Mn3azM/CyrQyH54I9GEbtDcw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdepim-runtime-24.05.0.tar.xz", + "hash": "sha256-ygf3rO3w+vf7O4vxA6st7Mxz1/3yuheeHC95FYfGRRI=" }, "kdesdk-kio": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdesdk-kio-24.02.2.tar.xz", - "hash": "sha256-IjdMcwnu4O3gJCDLzmoXC2lnoi1NdfIKqeO7GRyq230=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdesdk-kio-24.05.0.tar.xz", + "hash": "sha256-XF+QO7DAvUA53srQM5LYMF8L7729g361f//zB0jTXj0=" }, "kdesdk-thumbnailers": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdesdk-thumbnailers-24.02.2.tar.xz", - "hash": "sha256-uifW3KPs6UAUBuoDH38I6Fs1/snWu0hRLLYz3tXEBvI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdesdk-thumbnailers-24.05.0.tar.xz", + "hash": "sha256-vyDcFaXIpqCtrLVF7axVbMAmYoqVOoeAg5xstcstenY=" }, "kdevelop": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdevelop-24.02.2.tar.xz", - "hash": "sha256-M54jhw7jKHNvatPxcTxyqEr00VZSm/KUfxEz+tekirc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdevelop-24.05.0.tar.xz", + "hash": "sha256-rY8RwFccgtDWuwuBSREN2n5y9o/s9ilmgt+aqdkvmps=" }, "kdev-php": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdev-php-24.02.2.tar.xz", - "hash": "sha256-wDw2DGP/hoynhisDYsbGaTw2fAdpDMXlqJSrQ1BWKoo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdev-php-24.05.0.tar.xz", + "hash": "sha256-mWI1AYGdbWvl9NcryfUYkJqbGRCqcd46zQW1NBpMIbU=" }, "kdev-python": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdev-python-24.02.2.tar.xz", - "hash": "sha256-+Px+89s8x02OxzP+Tm1jifgYfIp/plhXcrWGox5KjWo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdev-python-24.05.0.tar.xz", + "hash": "sha256-GDg8MBo/j/rmZCEE9rQPJM5FsjI26iL7PxlM1OVYv5Q=" }, "kdf": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdf-24.02.2.tar.xz", - "hash": "sha256-K1ouYilOXTewDdoZeuXiJYBrz6jdGXXY8VEG2XM2Odc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdf-24.05.0.tar.xz", + "hash": "sha256-nihaoQZlzu3VNxosUGlou1GqTQMaRp0TkMIrdmffHKY=" }, "kdialog": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdialog-24.02.2.tar.xz", - "hash": "sha256-8d+N1LY/tO+/nbgDJquvfi99uDEo/kfShMbffYEucdk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdialog-24.05.0.tar.xz", + "hash": "sha256-i32SKv+7QVrwz9Q96GEuHa2Os+W40/QyhPG9UN7gskA=" }, "kdiamond": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kdiamond-24.02.2.tar.xz", - "hash": "sha256-DnX4x2wnaGIzr7vR+DrwNDAj1ocLeI6g88H+QxnVyJw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kdiamond-24.05.0.tar.xz", + "hash": "sha256-X2oXJ8r/hEE3EfGW9n3Y5LfcGf+ILKjUcCSEYQrErl4=" }, "keditbookmarks": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/keditbookmarks-24.02.2.tar.xz", - "hash": "sha256-vHSvzQFkt6zf/fMj/bR7KDtbCWClZ8B6AQI4oMCMayY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/keditbookmarks-24.05.0.tar.xz", + "hash": "sha256-q2iIrWj/O53U80luFVJ45yhvaGKaz9ZREth6mJ+nrXA=" }, "keysmith": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/keysmith-24.02.2.tar.xz", - "hash": "sha256-8WwhWSYQRNG/+T0bkOoPUI40xhukkmi1ysD7VyTbByw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/keysmith-24.05.0.tar.xz", + "hash": "sha256-J/MjuyeVmTAayOceV/Ri/ca+wCb4dIv4Cn5VSBzW7aM=" }, "kfind": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kfind-24.02.2.tar.xz", - "hash": "sha256-rg8fsCnEtLhRIszXH0wdGGkp7xkFfdrztyyhsyUsmK0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kfind-24.05.0.tar.xz", + "hash": "sha256-/aR31aSMf5QYCSL5ShjQAA3iJjUF07wtRlhwCL3KZyg=" }, "kfourinline": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kfourinline-24.02.2.tar.xz", - "hash": "sha256-R+fYzLd/df4yjW1URKIY+cPb4T4dHc6EIql2U4nMwy0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kfourinline-24.05.0.tar.xz", + "hash": "sha256-k8VNGCuiEOVY9YuLXE4MzOUaD6nZIrXmhYYj6PYYUKw=" }, "kgeography": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kgeography-24.02.2.tar.xz", - "hash": "sha256-DyQkUzTnW7j3uGzYlLVMsAuMtCGSgnPCy934KXWOdgo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kgeography-24.05.0.tar.xz", + "hash": "sha256-fiFOAm8BfQYPzGULSroONoGa1wOL1hJPrVPqYOapB2M=" }, "kget": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kget-24.02.2.tar.xz", - "hash": "sha256-4PkVdtAFGUdwAyEjufHEDSUKvMBWQEGkRZzvtzsDK2Q=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kget-24.05.0.tar.xz", + "hash": "sha256-zxCDlTIRSZkC3atOitq1nxijqLg4j9TBO9ARdfKtj8E=" }, "kgoldrunner": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kgoldrunner-24.02.2.tar.xz", - "hash": "sha256-0WcnGBJopqW9PuKy1TmDCePLOqwOi3AwB22mjlOzv3M=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kgoldrunner-24.05.0.tar.xz", + "hash": "sha256-V4bvEgZ/olNYL64+g7J98jIwOEhHboS+urBSoEqJp+c=" }, "kgpg": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kgpg-24.02.2.tar.xz", - "hash": "sha256-2XraIbCCSMjkTZGLR9pg8o+kpbksYVJzPzE36aLvBes=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kgpg-24.05.0.tar.xz", + "hash": "sha256-p/4339kBjAdpMgB0cxt7QAQ4l2okKMVgRQg0DLVElWQ=" }, "khangman": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/khangman-24.02.2.tar.xz", - "hash": "sha256-unFszlJqp8KI7K/CEV1BszbSaI4ogYzFI1OSWiz8SCw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/khangman-24.05.0.tar.xz", + "hash": "sha256-OsZSt3c2tKiF8ZhFdfYNqvmyX4Ckh0EibCnvBCNQjOM=" }, "khealthcertificate": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/khealthcertificate-24.02.2.tar.xz", - "hash": "sha256-llBNAYqMwXmB/f2R0lElXpUbTiR4GTlohHLefXRhxy0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/khealthcertificate-24.05.0.tar.xz", + "hash": "sha256-PklyOP7OdwUMF318RwE2LawqNYzCqiJkFQxkJL6pTBI=" }, "khelpcenter": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/khelpcenter-24.02.2.tar.xz", - "hash": "sha256-UghQIcT3Qr8oSQEDI7BD7RIaosyJ4H4sgV2JGoG95js=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/khelpcenter-24.05.0.tar.xz", + "hash": "sha256-xMUAvUYcWjJkFbE3qNoywJdCbSq3B8qc1QwnehGnexI=" }, "kidentitymanagement": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kidentitymanagement-24.02.2.tar.xz", - "hash": "sha256-nfCo7FkpgVkAdwZ+e+ed8YiUr060HylFHpPqduQIH0E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kidentitymanagement-24.05.0.tar.xz", + "hash": "sha256-eNzsufk4zKzP8lcrlRvwMyHOaymgWqnZcSDxwN87AhI=" }, "kig": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kig-24.02.2.tar.xz", - "hash": "sha256-k85+krHu+LZpUFskjEShugmLEXQ4xzNL/86bWm14tOs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kig-24.05.0.tar.xz", + "hash": "sha256-1Cx6DhSpN3s1ZkxMmqC3sfAZgMi/hzdTEICj/h3WD+g=" }, "kigo": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kigo-24.02.2.tar.xz", - "hash": "sha256-AMYnWg5IdTFMWnNfIPVChuInKP7U1k5k9U0KDFKwaBY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kigo-24.05.0.tar.xz", + "hash": "sha256-5kcgUP6GLmOp2mYG2CXpkwca4OgsODL+xH9DCKxc60c=" }, "killbots": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/killbots-24.02.2.tar.xz", - "hash": "sha256-idjc/On0HquWg13tJIdkdE/FM1fYvU9Rc2tQGaK6xIE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/killbots-24.05.0.tar.xz", + "hash": "sha256-4wtZ+/yOZfwcNi8OkVHgJ3m+V5uVw32nmg+opt5M40c=" }, "kimagemapeditor": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kimagemapeditor-24.02.2.tar.xz", - "hash": "sha256-RD7rYeNFiYE4L4ogHa9QKfnHlSXmB5njU/POoIVhMr8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kimagemapeditor-24.05.0.tar.xz", + "hash": "sha256-3lqqZrCmEpGJy6i1KM46Op1iz41+I8uX2su39DfVv/I=" }, "kimap": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kimap-24.02.2.tar.xz", - "hash": "sha256-YX9P//jQEHirTd66ibXCxE8tw5b96W/uRv6XSbMjM2A=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kimap-24.05.0.tar.xz", + "hash": "sha256-Y/EUFloLIHugR4WVCWXim8y4FNGhsgJrrxkA3MFy/cs=" }, "kio-admin": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kio-admin-24.02.2.tar.xz", - "hash": "sha256-JAgogPCAj7mzyPWDlHFZAtvHMWeveuLtl/Lk4oTKCbc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kio-admin-24.05.0.tar.xz", + "hash": "sha256-vRoOBqnd+nHKHOoyX8T5Wp2wONra+OtVN4/RpYYIK+I=" }, "kio-extras": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kio-extras-24.02.2.tar.xz", - "hash": "sha256-+nph9GHBYcNtX6RR0HDmllPyNAYgZI+BO0wry3mUQ8c=" - }, - "kio-extras-kf5": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kio-extras-kf5-24.02.2.tar.xz", - "hash": "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kio-extras-24.05.0.tar.xz", + "hash": "sha256-wrRjYTO3WAzrnDSkx33mW2Lk4NldfyPTtvDLLcdhVZ8=" }, "kio-gdrive": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kio-gdrive-24.02.2.tar.xz", - "hash": "sha256-Ejv0tSgW3QasBFXBsKzS9oTK1zUHX/btIkTvHjqSOSM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kio-gdrive-24.05.0.tar.xz", + "hash": "sha256-kZfiL3St37iLHIglsSzzB5Ly6jAruWhMvNAMswUFkoQ=" }, "kio-zeroconf": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kio-zeroconf-24.02.2.tar.xz", - "hash": "sha256-pnhOiXHJ7aRe4nGSj9wL/ytu4O0TTdtkiNqvHohqFE8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kio-zeroconf-24.05.0.tar.xz", + "hash": "sha256-pOeNCaJVsFE0KC6RO98dAL1b77AorGhYUCGqiChe1oE=" }, "kipi-plugins": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kipi-plugins-24.02.2.tar.xz", - "hash": "sha256-VQShO1Jx8IQYoXui2HX95LI3PKlT/lZLMJFI0eyw6G0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kipi-plugins-24.05.0.tar.xz", + "hash": "sha256-gzDY2w7sSBExkrSmQ/TbPkFs8o2CO8ZBXmbLUqS93lA=" }, "kirigami-gallery": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kirigami-gallery-24.02.2.tar.xz", - "hash": "sha256-cLt1nGKg5NFpeBwzTM21ZPTN4Kv1EJEL3oITNc53it0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kirigami-gallery-24.05.0.tar.xz", + "hash": "sha256-nX+YTNl/qBvE3QLKQ+wI5sfT//u/zkhx/GjAyKTnRy8=" }, "kiriki": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kiriki-24.02.2.tar.xz", - "hash": "sha256-BsMqgpi6ysmJHrkVURJC+A2r82aB3LEZNPdGKQUEdRc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kiriki-24.05.0.tar.xz", + "hash": "sha256-KhD9YAh7/CZkuQkhLdlWLYVxOyG8TTWWrZCtObEzliU=" }, "kiten": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kiten-24.02.2.tar.xz", - "hash": "sha256-7d6RgHGcmk1DR/upIclTnaRoiiBNwSRqtrt1zuYM67w=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kiten-24.05.0.tar.xz", + "hash": "sha256-D7wwOqzi2JrUnhKj1QMdC+AW/882scfcgPsIOZvL4kQ=" }, "kitinerary": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kitinerary-24.02.2.tar.xz", - "hash": "sha256-cW5uYhdcorV3598YjJFDpS4plMdQBzR8DTisAQSeKvg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kitinerary-24.05.0.tar.xz", + "hash": "sha256-9P2SFBfOnJgq8b3Br99xO2/w+A6rwngeWrVz9X7VJaM=" }, "kjournald": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kjournald-24.02.2.tar.xz", - "hash": "sha256-OTE9s1JLRha846is7JxUvIOg07woNxYKwHQw0E0Mims=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kjournald-24.05.0.tar.xz", + "hash": "sha256-KbXTUIS+aBWX3afW0wA202wLlzzNahaA/xOKtvNx8Ps=" }, "kjumpingcube": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kjumpingcube-24.02.2.tar.xz", - "hash": "sha256-Jw0mjtZIvdgOok2odrl5v6ScMpqJ0jFZJYm+ufjqNw4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kjumpingcube-24.05.0.tar.xz", + "hash": "sha256-6ZrSWvI3vKH4Ga24UDY2ZfN1SKulGznfvvJWbgfN/YE=" }, "kldap": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kldap-24.02.2.tar.xz", - "hash": "sha256-lUb0yqIDQQCqtoyeiT/gMvk4IVFbvTGUMl3YQQ9OGFQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kldap-24.05.0.tar.xz", + "hash": "sha256-iim3l6ySAOzl7HU7Hb/sVNTaWo4PgtWCPG8+wI3qHq4=" }, "kleopatra": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kleopatra-24.02.2.tar.xz", - "hash": "sha256-B3Q4U7sbZt3xwKP5hh/PIecWvF5Z2EB4wC/rnzXGQ8U=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kleopatra-24.05.0.tar.xz", + "hash": "sha256-rO3sEjj1wg/sqS1QXRuoGDwvcs6xJ4jslZ46MzZFOEA=" }, "klettres": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/klettres-24.02.2.tar.xz", - "hash": "sha256-eH/tX6Hv/uVs6WmPKL7aa4eWn42sTzN3j9Kbf0RIuwc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/klettres-24.05.0.tar.xz", + "hash": "sha256-1iNdb5Og2cht/deu+DPg49ndKStRVM9fKMu6m1BkHso=" }, "klickety": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/klickety-24.02.2.tar.xz", - "hash": "sha256-S4zFnyrghWPvF6mdOzrtL/zs8zWD50PUJovHO1F6tlQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/klickety-24.05.0.tar.xz", + "hash": "sha256-E3M16vBkdNYYUUjJwfn8Y81gma9jc4U5S1Dj7/yxNVw=" }, "klines": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/klines-24.02.2.tar.xz", - "hash": "sha256-ZQMF9WAqfckjh5qEz0796OdD2CYRu6b8QC4iyc7LCOY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/klines-24.05.0.tar.xz", + "hash": "sha256-UAiw8+ThdjBck1vHXUkL8XTB0+5n4T60Ps5rzJEYcdI=" }, "kmag": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmag-24.02.2.tar.xz", - "hash": "sha256-nDkcfm7gntmatD5enyt1WvWaoUShjojylTKFmfeC8CY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmag-24.05.0.tar.xz", + "hash": "sha256-quQfo4de42k99umLpR0jY98XUio0716Ak3bWFrpaVlE=" }, "kmahjongg": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmahjongg-24.02.2.tar.xz", - "hash": "sha256-T3RMz/vQVyu2FgdoiNcZmhxxBur3DZAGJEEAnPG6UhI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmahjongg-24.05.0.tar.xz", + "hash": "sha256-CJB8EO4+BcIM+ywVVRhpQ+XBB3Qnav5YCIr6zuZodJQ=" }, "kmail": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmail-24.02.2.tar.xz", - "hash": "sha256-8AVx6obaeDqueB8fHTmO3yn1nSi0F1dQNVtzyhlyGCY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmail-24.05.0.tar.xz", + "hash": "sha256-qYoEr70P6tvute2llgyQK4TJPujSYV2tkOBNh6sGK/Q=" }, "kmail-account-wizard": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmail-account-wizard-24.02.2.tar.xz", - "hash": "sha256-va6vyIgl4UMX3NKQhZJcDW780fCYX0gSY1OSGWdH8fc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmail-account-wizard-24.05.0.tar.xz", + "hash": "sha256-RAIJUocA/mSP/74UPLZX0LyMYnV3au9qTjXV9FOFw60=" }, "kmailtransport": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmailtransport-24.02.2.tar.xz", - "hash": "sha256-KK86kGlccotCWEt/rjSPlmxx+LaI+dN5L2RrVdZgxlw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmailtransport-24.05.0.tar.xz", + "hash": "sha256-jsZBkt+K9Tia5pAfdgrPljDEvj5T6XDUENhu0rH//UE=" }, "kmbox": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmbox-24.02.2.tar.xz", - "hash": "sha256-b6z07FzQU83j4tNHmepydqZI4QdjXg/AohtB6uZcPo8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmbox-24.05.0.tar.xz", + "hash": "sha256-2d4UvxNatfvH8zkVorqyJTMWlojG0P0RPntR5tdEDpo=" }, "kmime": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmime-24.02.2.tar.xz", - "hash": "sha256-Q03G9tI9Zog2t5TmNmCk2/PpOZ6E/OodGVd6SgnmSuI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmime-24.05.0.tar.xz", + "hash": "sha256-fARJdKwfOs3gGAR2ayTr4Xt0EyAeeOpP+fTw1347uLk=" }, "kmines": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmines-24.02.2.tar.xz", - "hash": "sha256-jAR6f0ykQhknrER4Uyi4z7eyz21J0Te5wnrtUkF60Q8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmines-24.05.0.tar.xz", + "hash": "sha256-pDhqzoFk6B67KUpVhzAtaRCGwqs5srusRjICItpFlEE=" }, "kmix": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmix-24.02.2.tar.xz", - "hash": "sha256-g4QRJujC/1YDgoLd78IA97rHDrYHpWqXEVX0L1q4VrA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmix-24.05.0.tar.xz", + "hash": "sha256-gpar79OJg9jOAUsT2Jx1K8Z2gXsurti65EmzibAzgpU=" }, "kmousetool": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmousetool-24.02.2.tar.xz", - "hash": "sha256-Wja9ym8V1IPVZ8sW0Fu6CF8w2pNvX/3ONR95vj5DnEM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmousetool-24.05.0.tar.xz", + "hash": "sha256-+E9rHlbuJi8/do5XV6S3Yj6/P8ZkhqCpGlwYYX92n9w=" }, "kmouth": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmouth-24.02.2.tar.xz", - "hash": "sha256-XcgN2soQftHjqmTjn14cBDiIoWaCzW/U5PSRyu4MxJI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmouth-24.05.0.tar.xz", + "hash": "sha256-IFgIHEbjQVeYk53NDKa5SYk6p15U38h7YVPHME6xXsw=" }, "kmplot": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kmplot-24.02.2.tar.xz", - "hash": "sha256-HzUY0azJytTeSWEFYS7l5r0+gYWYTWDValfnRptQAoI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kmplot-24.05.0.tar.xz", + "hash": "sha256-NA9k/1BLJGhRpAmYhnV7uVllgfcauOpGDlOGFVhWl2A=" }, "knavalbattle": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/knavalbattle-24.02.2.tar.xz", - "hash": "sha256-uXiV2i2mnzCaB+o9LM8Iu7CF2cocpTjDVG74AtJPh6E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/knavalbattle-24.05.0.tar.xz", + "hash": "sha256-G6rWWotIeuvgJG/TL6RcxNXVTMpx079dB2jtc5pSvRk=" }, "knetwalk": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/knetwalk-24.02.2.tar.xz", - "hash": "sha256-omYtJDKvpqMD2cu8Xqh4U2HVU6ZRvJcyaktTnKydyzE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/knetwalk-24.05.0.tar.xz", + "hash": "sha256-EAz+GY24XllxC65I0DTp79QccDThGchmoWNcbf2Uphg=" }, "knights": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/knights-24.02.2.tar.xz", - "hash": "sha256-D+yDyGK0jYkP39vgTvM35ohV2NxSvouhuZ0wsW8Z4P4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/knights-24.05.0.tar.xz", + "hash": "sha256-7ZBhn3njRM62EA/Z1wb4WL2rC4nZqoAg7JXJGA1gSvI=" }, "knotes": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/knotes-24.02.2.tar.xz", - "hash": "sha256-kKszYhuQD2kWxIZItIF85GhObcyOWxmVVUt+JXSInHM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/knotes-24.05.0.tar.xz", + "hash": "sha256-QyQIQq6CA7WqZ6HRNcaAx95M+nQVmcTLjlt0ghk0W/c=" }, "koko": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/koko-24.02.2.tar.xz", - "hash": "sha256-c2SD1NLraPGvoK0YKr2JcwSVcJgjytn9cngE4fSFMVg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/koko-24.05.0.tar.xz", + "hash": "sha256-gDebUdHD61vs3h0DJjwk/K6Y1NLoi4ttBXypz+sQqbk=" }, "kolf": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kolf-24.02.2.tar.xz", - "hash": "sha256-Cyy/w7UJwJMFwCGf8mZ6EM7uXozqIvUbwLqf/Tei61E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kolf-24.05.0.tar.xz", + "hash": "sha256-mAPSHv5KyirHktvNEz110tM5BXNK0GTDv4zNqgwQj6A=" }, "kollision": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kollision-24.02.2.tar.xz", - "hash": "sha256-pb3AEFqTAlfJgdiWv3cy0d+vnd3isEVsi0/l9Ccd7cg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kollision-24.05.0.tar.xz", + "hash": "sha256-ww1wGsoFF1+1u8UYftTtaGpO+QDNBg/EFF4Yov8CG2s=" }, "kolourpaint": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kolourpaint-24.02.2.tar.xz", - "hash": "sha256-ABn+QdloID2+XGwBZoWOxTkV4tZ+AH7xZonkDtGbnoQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kolourpaint-24.05.0.tar.xz", + "hash": "sha256-ZJ5f1UnFSEaV/1Chltxg+fYcPeNUbv8LUuqfQin5IV4=" }, "kompare": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kompare-24.02.2.tar.xz", - "hash": "sha256-tASJrlYEAfUuUaMJpxqxEdVMTvJLMAbmsu8V1XXyh0E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kompare-24.05.0.tar.xz", + "hash": "sha256-9v5g5rOtnhDetTcYFISBzhqDu//zKh7b4emCF5mKZ3A=" }, "kongress": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kongress-24.02.2.tar.xz", - "hash": "sha256-t21I/7esniEZCt/1Yvn5ejczDw/6n45FmVD2yFqP+Kw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kongress-24.05.0.tar.xz", + "hash": "sha256-PGiHXZojhiGP0hQoHFPi8XrCd9Rn7DvnAJWVTh6+iME=" }, "konqueror": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/konqueror-24.02.2.tar.xz", - "hash": "sha256-Bk8fBm391PdP8cnkdXXIukfeR91tX13RhWUA702bxjI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/konqueror-24.05.0.tar.xz", + "hash": "sha256-UIlCx5+2WgIxV83Ca7/MdFHFBvpfjNBu/rHanYJiJC0=" }, "konquest": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/konquest-24.02.2.tar.xz", - "hash": "sha256-41BXstbTrQ08J0CZ3Nk3Qwq0KlsHoYUuF+4oANM67Cw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/konquest-24.05.0.tar.xz", + "hash": "sha256-mH7IjXvMHLUs6VoTGqnvrZuVP7JzmL3NJTTGRaQkhLc=" }, "konsole": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/konsole-24.02.2.tar.xz", - "hash": "sha256-ZkZ+M2U2199cErytMaPvCiFQxANR2HZ3BHpA6uRA7i8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/konsole-24.05.0.tar.xz", + "hash": "sha256-U+/SXB1XREjbV/RG9CMyjH8vCIifZ978HtXHg8nvR/Q=" }, "kontact": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kontact-24.02.2.tar.xz", - "hash": "sha256-vXEUyrfFucXNNuxEgofIX2HZQySjNbIbO7+AJSDWH7Y=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kontact-24.05.0.tar.xz", + "hash": "sha256-GEo3RlWD1nh4JU3J4Z+/2Mv0m0Ub2GE6GhGCT56/EKY=" }, "kontactinterface": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kontactinterface-24.02.2.tar.xz", - "hash": "sha256-cg4U708BtnCQvNfHQHYBa/GTdrC2woEK4eQ1Tk1la7E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kontactinterface-24.05.0.tar.xz", + "hash": "sha256-PaCF7y25d/IUp179Qm1K8GXwumAqGkzVAeBquNUTs7A=" }, "kontrast": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kontrast-24.02.2.tar.xz", - "hash": "sha256-C2etCsl1TVS2ycSSoB2f2JMq3XGY7DIVY2mBCiWlutc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kontrast-24.05.0.tar.xz", + "hash": "sha256-YYvQLhS8kkHjt7p7W6oGU7PMvZVFzYSYIEAtdvmJSNk=" }, "konversation": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/konversation-24.02.2.tar.xz", - "hash": "sha256-uBZ7BUZbDEt8ukJjarW0DrzNmPCIkjRR00sDn/sV4kk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/konversation-24.05.0.tar.xz", + "hash": "sha256-845Wu1uZ09FYcOzzlBkDGGLmeBzRYmbcM2JUNBJLH5s=" }, "kopeninghours": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kopeninghours-24.02.2.tar.xz", - "hash": "sha256-yty1NgsYW6Zt4hOBpvlpCmhItL/mC/QMKvvW1QlWcIQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kopeninghours-24.05.0.tar.xz", + "hash": "sha256-ysxgl9jm3N/DPoDuQUimjJfeLsARbH9H74l4AfFxUfs=" }, "korganizer": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/korganizer-24.02.2.tar.xz", - "hash": "sha256-N0osNS9MZF9e/xXTsWWnpZZkdTe1lsHu5J3tITQXBBc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/korganizer-24.05.0.tar.xz", + "hash": "sha256-4SpL40G6Mi1mboRtOBTvtlj7jDWai/ibSDaeuAOTCtc=" }, "kosmindoormap": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kosmindoormap-24.02.2.tar.xz", - "hash": "sha256-+TM+Woo8aWp+tMNH4lrqnaVQyVeoGfLA9cgkYcLnLhQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kosmindoormap-24.05.0.tar.xz", + "hash": "sha256-85lf2Jm3D3C8/yLZFZbUFDA0c86v4kqk6NBbBDbvxTY=" }, "kpat": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kpat-24.02.2.tar.xz", - "hash": "sha256-+5+beBUHIL/s1GT0RTHxAeOmzd/jcDLjkrco+CGkFVo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kpat-24.05.0.tar.xz", + "hash": "sha256-tKtW3jq3xPpnc3OdPdm8yqlMpWM6bC8sP7VOZjSPdno=" }, "kpimtextedit": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kpimtextedit-24.02.2.tar.xz", - "hash": "sha256-Vzi9SEiOrwOHCkZGsQkdYjjXQh4saTyFPCBeGpy+ECA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kpimtextedit-24.05.0.tar.xz", + "hash": "sha256-kJGtdDMt27mINyU8fVvmMZriXrCpmigmgv2+mRiCRJs=" }, "kpkpass": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kpkpass-24.02.2.tar.xz", - "hash": "sha256-V5dueLjQwPXipAHLm9RMmGNC9O2yWJeOa9om+eyjJa8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kpkpass-24.05.0.tar.xz", + "hash": "sha256-s3DcESUH2/hwM9WgSRS+6unmU4IDdP0bSLR29GfYrSg=" }, "kpmcore": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kpmcore-24.02.2.tar.xz", - "hash": "sha256-KdOQmtXLv6HlvXcsl75IJUB65uXv61pt3uWwBcmWVL8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kpmcore-24.05.0.tar.xz", + "hash": "sha256-CQYrDEGvApQ36MpOpPGrLRzGK/ZqzQMA7nBOSEI4Ej4=" }, "kpublictransport": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kpublictransport-24.02.2.tar.xz", - "hash": "sha256-fZOd/G7PrXX263sjS2Txq29S/A6Yi6XmZi6VxS4auyY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kpublictransport-24.05.0.tar.xz", + "hash": "sha256-qaJa0zmKLckou2mt0ZR8g51zzo4AlXt7vWuYVHf0N7s=" }, "kqtquickcharts": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kqtquickcharts-24.02.2.tar.xz", - "hash": "sha256-L0mAg8QmnGk/+/wweS2hQ4PGMfm52Q+rRK7HaLdI1b8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kqtquickcharts-24.05.0.tar.xz", + "hash": "sha256-Hkj2aE59uzISQJJzx1vquVBUtGaYZlovoetTksOgVM4=" }, "krdc": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/krdc-24.02.2.tar.xz", - "hash": "sha256-qk6HhkgNzLWEBTL+jJGIiBQ32MpZqYz/z/ZoXlV5r/k=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/krdc-24.05.0.tar.xz", + "hash": "sha256-TOTSVSDU3BN73qfZnNjm/m6itFc4nbX6ZZAs5sJw3nI=" }, "krecorder": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/krecorder-24.02.2.tar.xz", - "hash": "sha256-CYK209/BEP6UaOZ/0VfwNoOq5CQ7bqAddKGZQ8a8gtI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/krecorder-24.05.0.tar.xz", + "hash": "sha256-OTUviqOAq671zpPPnDtO8+Nd/6ac64JAkeQti/cTjzI=" }, "kreversi": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kreversi-24.02.2.tar.xz", - "hash": "sha256-0cBXOF7xZ9NcBQ0ARNCsxA2l2f5McwA0OG94+er4vLQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kreversi-24.05.0.tar.xz", + "hash": "sha256-Gz3gNEO+K2KkKB/mtngcWUqp9C9yUismwP+/C2Tj30s=" }, "krfb": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/krfb-24.02.2.tar.xz", - "hash": "sha256-z5Lfx4Z+M2BHV6Wf+NKIaTu/X7sM8Lw3nD+XXQ5OmOQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/krfb-24.05.0.tar.xz", + "hash": "sha256-qo9ygdOj5Eq34gh7flZ+P+0SXkXTVQnAOor71O4N2pU=" }, "kross-interpreters": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kross-interpreters-24.02.2.tar.xz", - "hash": "sha256-9qWZL9xdSEw1jzrNMBiQAlOmgmPYm0wzvoU1SYFOhrs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kross-interpreters-24.05.0.tar.xz", + "hash": "sha256-kYa0N+H83S7pzINYbHMqOTDVX/79OSqrQfjUPJ34kfk=" }, "kruler": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kruler-24.02.2.tar.xz", - "hash": "sha256-EkTdt+ynfPWpVQEdGRaYYBb/8SsJNn+6Bd6b6EGVRQQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kruler-24.05.0.tar.xz", + "hash": "sha256-UyP+7wC3eodUt+aKDemcUWBAg0/3+NYm4FG2oOFJCks=" }, "ksanecore": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksanecore-24.02.2.tar.xz", - "hash": "sha256-GGNiZAlbtW7mQYW0GJ1+oU8zpp45K4GLuw3m/8G7gXA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksanecore-24.05.0.tar.xz", + "hash": "sha256-yk+AubfXwmSD0+vXJ5p/aw4I0XyUGd3gYXgLO/vBFb0=" }, "kshisen": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kshisen-24.02.2.tar.xz", - "hash": "sha256-/BPyAKjRTfLOWX80E82Ar6NHSvArARE9+jB0hnjRHFQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kshisen-24.05.0.tar.xz", + "hash": "sha256-Bnks4NGuNmaSkUV2oerRh6bEUujPT8Ab6s0kAuSEoE4=" }, "ksirk": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksirk-24.02.2.tar.xz", - "hash": "sha256-n78THAngDNSQJV93n2a3HzEtMxpaBrk9Jj6x2J53EcI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksirk-24.05.0.tar.xz", + "hash": "sha256-iGPsBTZqd1Tzp5mtYZdWzBe7lW9P73/TPXPOYIRVfxw=" }, "ksmtp": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksmtp-24.02.2.tar.xz", - "hash": "sha256-tSLg5bcoh3fM71oVUCdueC+k1N4NTf1w86zOS3d4NZg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksmtp-24.05.0.tar.xz", + "hash": "sha256-Bqz7OXsq1bO3sxdav2WzLEnVbVwUyQ7CkOybAaVZ1S8=" }, "ksnakeduel": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksnakeduel-24.02.2.tar.xz", - "hash": "sha256-QLUOa6+y1mK2tMXGzshFDylv+7FR/9rzcSAgLyxZ0wE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksnakeduel-24.05.0.tar.xz", + "hash": "sha256-F6oni0hi6k0hnD3njsgn3sBYzK6yAm7iMXpQtm5NPNc=" }, "kspaceduel": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kspaceduel-24.02.2.tar.xz", - "hash": "sha256-gNE4hXZinXdyYsq5Tjb0UX1B811FJgO5H6CM1oEqU64=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kspaceduel-24.05.0.tar.xz", + "hash": "sha256-AbodAsJGZUmcKMePZJT5rdvQphw5QuNrdX558pAw2Js=" }, "ksquares": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksquares-24.02.2.tar.xz", - "hash": "sha256-nkiDNK/O4vyWvobTmk3a1rao62o9oVRXuSB4AzP0MKo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksquares-24.05.0.tar.xz", + "hash": "sha256-zNEFC9m8HwKz/lUPwBLvXra/FMJaELn3BSwnOMIjfjI=" }, "ksudoku": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksudoku-24.02.2.tar.xz", - "hash": "sha256-ICmFLSFllJ80uRKQJwRhPF1sRxxARhtkKMra9SmMSBY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksudoku-24.05.0.tar.xz", + "hash": "sha256-Ssd4rBLpX+tarMn94yP5QFjoulx7SWrb1i9RjBLExFM=" }, "ksystemlog": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ksystemlog-24.02.2.tar.xz", - "hash": "sha256-25Y7u7lMO3tfgTpTLwceyBoTvyt1ocfO1//yNB7rSjM=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ksystemlog-24.05.0.tar.xz", + "hash": "sha256-tdvwuyGNw5J8TYhWJbviIn9P92qDQY0I2q0OQOTXcEo=" }, "kteatime": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kteatime-24.02.2.tar.xz", - "hash": "sha256-3L1mdrKqCyElAot9Y52nLNDi/BY9r6D3Hu+Nj/+lfZI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kteatime-24.05.0.tar.xz", + "hash": "sha256-h5DVfxzO+iEBGhCICrLsDwqmZIi98USs2MGK1LdL20A=" }, "ktimer": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktimer-24.02.2.tar.xz", - "hash": "sha256-SHKwC7OiqM1q9Gf2M0zP0Ely0AexRFmB8PsU162sCUI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktimer-24.05.0.tar.xz", + "hash": "sha256-vsDaZ8NVdARMdOJ6mLpfpzCpLbhB35WPex6NrDgS6CA=" }, "ktnef": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktnef-24.02.2.tar.xz", - "hash": "sha256-dMjcjurpj4/cZSlOPXdQKfGu9Kwm9AbIghk4F/bPnR4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktnef-24.05.0.tar.xz", + "hash": "sha256-hthFFgwqWb7xkfCsNeEWMOkhI578bG/vmOpUD3TuB6o=" }, "ktorrent": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktorrent-24.02.2.tar.xz", - "hash": "sha256-AYPGM+NQOG8xwudjsJSM2GYskQLIcX3S3mxPoAQs39k=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktorrent-24.05.0.tar.xz", + "hash": "sha256-U/foycDFku4s4Chs2jtXmhJPl5BXrjsKrNwT4m6Uoak=" }, "ktouch": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktouch-24.02.2.tar.xz", - "hash": "sha256-U5EPl243QbL8++IzpVgvasyuUODiXxLV/bf+UxFNSOo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktouch-24.05.0.tar.xz", + "hash": "sha256-dWDoCiH1ysTGgKoxT3wA0NjLbBwpLE23g5k1Ezid0WI=" }, "ktrip": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktrip-24.02.2.tar.xz", - "hash": "sha256-CLaGGqmooL9GEWDoH+Udxp1kjZLldbzYLtyp3sS+sR4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktrip-24.05.0.tar.xz", + "hash": "sha256-G0PVf+3CsBPJGgoh5EqJllrNYRrRGZfyQxQmTu9xmn0=" }, "ktuberling": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/ktuberling-24.02.2.tar.xz", - "hash": "sha256-6/cMKUOL5DEHM6nUwqgi0uWFvQGlkkyZ3CgSlWUASzU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/ktuberling-24.05.0.tar.xz", + "hash": "sha256-IIDcX+cy9eLk0mDrg9oFcCrB2Uaqv74F2oUjoMqP/ME=" }, "kturtle": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kturtle-24.02.2.tar.xz", - "hash": "sha256-BPE208EdQqWdNW4YU5KOwob42BHlJMwk2ae3E7j05hs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kturtle-24.05.0.tar.xz", + "hash": "sha256-ZIXknLSbrtk1/DxBK2fGgdVaHhVsplj7wK6hqCY3PnQ=" }, "kubrick": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kubrick-24.02.2.tar.xz", - "hash": "sha256-x4BOcm7XD1V1/S8QeFv7WbfcZ8xe4dImHrKKWxS/PrE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kubrick-24.05.0.tar.xz", + "hash": "sha256-4sBSE0NSMXRr9UYoJ+ogfKy8IGZlNdd+G2ikvOXrP20=" }, "kwalletmanager": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kwalletmanager-24.02.2.tar.xz", - "hash": "sha256-C2M4X59JMq8AQX6x6yhUje3MBQaREwS/LjRHmsD5t3M=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kwalletmanager-24.05.0.tar.xz", + "hash": "sha256-qqx/43iCS13dcxtGoxQyrLtC880IC4yYMDA6UnYkZqI=" }, "kwave": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kwave-24.02.2.tar.xz", - "hash": "sha256-qi0Qdp26bNQ/qqme+binWIF3IifIaNfeUpM8zZHNkmw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kwave-24.05.0.tar.xz", + "hash": "sha256-pntIYFZ9Yb4lFMeAZBdH6ohNT0Tduggim4TC3VeQ5DQ=" }, "kweather": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kweather-24.02.2.tar.xz", - "hash": "sha256-iXvKld4QqZ0yxt+xyZIioK38FIR29Owr6C7GKCjcamI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kweather-24.05.0.tar.xz", + "hash": "sha256-+v863UAF0EwziEeum3obwuXG1fRbb1qW7IBtqRueS74=" }, "kwordquiz": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/kwordquiz-24.02.2.tar.xz", - "hash": "sha256-4yGwfUHHdHXCmZRA+MxLKRv0Xuu0O4iGqpRCReGuuuc=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/kwordquiz-24.05.0.tar.xz", + "hash": "sha256-akh5t53uOQoB9BoUzA5QQn2DojDZdzreSt+vmkdANY0=" }, "libgravatar": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libgravatar-24.02.2.tar.xz", - "hash": "sha256-t99V8Jsy3P5mjlSccay6d81iCXoYcTsxEr79b0o+UoU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libgravatar-24.05.0.tar.xz", + "hash": "sha256-U8RZknoAtFBKA2hKbwaw+AHGbzGw9yAs5k19kFl39Ps=" }, "libkcddb": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkcddb-24.02.2.tar.xz", - "hash": "sha256-YIqiEBvev4rhwjz5nPyYLE5jSUWpGzv0SZD4bgGp1cE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkcddb-24.05.0.tar.xz", + "hash": "sha256-KnuEQNrXYN0EvsxvunA0Q2SOxK3xz0PRwfKKSVUGd2s=" }, "libkcompactdisc": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkcompactdisc-24.02.2.tar.xz", - "hash": "sha256-2jbvjdAukuQUMHu9NCpQLQ6StaqSrh4ktsXT8eGvC24=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkcompactdisc-24.05.0.tar.xz", + "hash": "sha256-wsYQ0/ggwk1Sq5iNR/pESEqczqzlu99BV1mBMj5hM2Y=" }, "libkdcraw": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkdcraw-24.02.2.tar.xz", - "hash": "sha256-fGtMsK+RCFf9vtTb+6b8xa7iaqMZk+6rMhm3NDwxktY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkdcraw-24.05.0.tar.xz", + "hash": "sha256-U3bdRq0ho0WnOckSlRDzzYvkazr5WOS3IuaoFkmneIk=" }, "libkdegames": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkdegames-24.02.2.tar.xz", - "hash": "sha256-PGv3c2cORQm7xxYEvwoUkQ0HZDQyahV1bTxHsfWufhk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkdegames-24.05.0.tar.xz", + "hash": "sha256-jLs7v7zE6cX9Fcth/1Qt4XwfWmaEB6lQ1HoxHqDdfuQ=" }, "libkdepim": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkdepim-24.02.2.tar.xz", - "hash": "sha256-OwgxUW3mLSVIjpJ/x9mHSvsVke+99B3smQMJ9iJmdMA=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkdepim-24.05.0.tar.xz", + "hash": "sha256-Yv7fUMmSlvsHbJ9OoNkHIoo/kSyPknxFkVbLXIlQuoo=" }, "libkeduvocdocument": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkeduvocdocument-24.02.2.tar.xz", - "hash": "sha256-yvv+gkMvpOIGkE5+4AikFYwrp1UTTeO0X6JKQ+s8XO4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkeduvocdocument-24.05.0.tar.xz", + "hash": "sha256-+oVNfb8xSJX0LLH37hFKlF73Y8X4o/MtOAT49kf6t/I=" }, "libkexiv2": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkexiv2-24.02.2.tar.xz", - "hash": "sha256-rmAib0iTlLI5FApCZqLbRwoLzBptd7A8ca4ePu/zCNw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkexiv2-24.05.0.tar.xz", + "hash": "sha256-DO7WiuF8wiXJFddOe2fnfXkS1WYTwKhCz+AN0X0FTXQ=" }, "libkgapi": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkgapi-24.02.2.tar.xz", - "hash": "sha256-xDyEBSWDgMs8ZrkehZptmhlJUl0r5zHXA+ofS37DZ8A=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkgapi-24.05.0.tar.xz", + "hash": "sha256-2Hi4UhqoMnb4gH+Xz6WzB5iKYJTOwFVhR/rKWukXOYE=" }, "libkipi": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkipi-24.02.2.tar.xz", - "hash": "sha256-my4K50w3dmNhOUboLdTmM3T75SMYYyFm2hC19l1jAlw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkipi-24.05.0.tar.xz", + "hash": "sha256-k1qhwNpc7EiLewh6Z93jL98UgKdJLEzE/Aj+wXslEcM=" }, "libkleo": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkleo-24.02.2.tar.xz", - "hash": "sha256-L+OtUASsm0JhYTjvL8DSGyYoIZLQ14YY4SsGpfpz9Jk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkleo-24.05.0.tar.xz", + "hash": "sha256-PQn6J80PagQQdk2xIH51e3IWueavObyhozDOE3jhZs8=" }, "libkmahjongg": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkmahjongg-24.02.2.tar.xz", - "hash": "sha256-IiTZXCofO+Zw8FF/3tD14lxQ5JgnTN/gFz09GyXAU3w=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkmahjongg-24.05.0.tar.xz", + "hash": "sha256-ldNWTua+yzgfSYRMCkfB9ntMnXVTB68E/24J69zqfS0=" }, "libkomparediff2": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libkomparediff2-24.02.2.tar.xz", - "hash": "sha256-32BysV5/yG+oYpg4L7MyrNRi7MWnKuQF/vdNXR3SctE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libkomparediff2-24.05.0.tar.xz", + "hash": "sha256-IroodwLcRIs8n0V6tgxuTL9o+1Qc2DpnvSh6oFcyMA4=" }, "libksane": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libksane-24.02.2.tar.xz", - "hash": "sha256-L/x/3blT7w+cOOssK/QC3g+VIMNULTJH97XBnuGF2P8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libksane-24.05.0.tar.xz", + "hash": "sha256-5zxvGmWuQNrs2ZTCmq4Oh5uYMvAHg+oimlyJcGkXEcg=" }, "libksieve": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libksieve-24.02.2.tar.xz", - "hash": "sha256-nQQKSswYDcBAsrM/wOFL3baPfvwq17PVVNyQM+xDZfI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libksieve-24.05.0.tar.xz", + "hash": "sha256-VS4FpqEytxp4vLWoHM69gpudWc6k4J5D9IBdl9+Sy0M=" }, "libktorrent": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/libktorrent-24.02.2.tar.xz", - "hash": "sha256-ARbg//48qtlPryDnQMqyWBRSFYwuhCoEFMrMZaNOeGE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/libktorrent-24.05.0.tar.xz", + "hash": "sha256-c2E+uc+P2xv/Dd85d2mIcTI0T36wVv9BJ8MH8axAj4E=" }, "lokalize": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/lokalize-24.02.2.tar.xz", - "hash": "sha256-4ZuoMUr2N7yVc/mkAKqpLxNtvffzaH8bkg4NynHpr3w=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/lokalize-24.05.0.tar.xz", + "hash": "sha256-Enb4o2klXbFvLQHJs3i9k8LWaA+j9Sn8WkSJrMqtJK0=" }, "lskat": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/lskat-24.02.2.tar.xz", - "hash": "sha256-U/lZYMyrYyV5NGX/09W/kOnnT4xoqp77manwFci2J10=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/lskat-24.05.0.tar.xz", + "hash": "sha256-kx+A+ePLPGUaB0w3oknEGTpk096GJbs90P6CyKNw/eg=" }, "mailcommon": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/mailcommon-24.02.2.tar.xz", - "hash": "sha256-0uZCGDg3a1PX/KmqBmMIOzuU8CCesvxWAa1hK+5CFgQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/mailcommon-24.05.0.tar.xz", + "hash": "sha256-4Td+R9b5xgJrQyG4BgOb/fnMSqGQzxwzWTCx0BoUPoM=" }, "mailimporter": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/mailimporter-24.02.2.tar.xz", - "hash": "sha256-YoC+/T5OZqjpgupixj4tGZ35ppjbPw3s5SaYp7lbEAY=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/mailimporter-24.05.0.tar.xz", + "hash": "sha256-KdZwH2g6JHhmtZSQ6yYFVEq+hdeZU9zPP/KDhjVtP0w=" }, "marble": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/marble-24.02.2.tar.xz", - "hash": "sha256-idduAigL9MkhVVo4Pdl0n5GlNvX4MSTtdytvN59mS+U=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/marble-24.05.0.tar.xz", + "hash": "sha256-4XoqCHzaQgPYWNDLrlTdTI0SOAFK+k5TL7gNvj8bqaY=" }, "markdownpart": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/markdownpart-24.02.2.tar.xz", - "hash": "sha256-QcVLhmJ3V42hxecYENrnUPU2N2QKFL9Rhf9tPK7T/vQ=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/markdownpart-24.05.0.tar.xz", + "hash": "sha256-P0F2889BsV/O0lHuchHqz0t4Y+iczOOnkyKRJKMWKqM=" }, "mbox-importer": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/mbox-importer-24.02.2.tar.xz", - "hash": "sha256-aJHBZE5pNTYVLdfVpM5fdicX/Ab6xWNtfnfJzJHg12c=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/mbox-importer-24.05.0.tar.xz", + "hash": "sha256-fxZ8kBnKmf8cWnTIFkszbz3KROKA9c2g7g7vxTagkUk=" }, "merkuro": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/merkuro-24.02.2.tar.xz", - "hash": "sha256-Gvy3GGOYog7LJqg+ADOFKn+CwQwdIaykO5KE8VLdBjs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/merkuro-24.05.0.tar.xz", + "hash": "sha256-62MuWhger9fwcSUxsazK91XYHIDrm/j+3YxZ/UMFyuI=" }, "messagelib": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/messagelib-24.02.2.tar.xz", - "hash": "sha256-Ix2aemO2AYO9V60dNyWQ9FZUlniopKqx+Oaw2ET+7F0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/messagelib-24.05.0.tar.xz", + "hash": "sha256-wOoDA9OfAW+sOaiomp7XT9j0kVeZl945MlNCvQwSzcE=" }, "mimetreeparser": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/mimetreeparser-24.02.2.tar.xz", - "hash": "sha256-G6iK0f9ESjLC6RlcHJF8HVFqi54DLkm36BAhs4QdPe0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/mimetreeparser-24.05.0.tar.xz", + "hash": "sha256-CUAOSsnLWQkGxaCnGWub6N69EvZW8f+EVTe7RHwEdV4=" }, "minuet": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/minuet-24.02.2.tar.xz", - "hash": "sha256-RSpwnDV9Ro8kIRbuNfFiZqy3+mYKPWT3ThadoVjEFHU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/minuet-24.05.0.tar.xz", + "hash": "sha256-QRR35LK6+/eBVrb5QEqGdTNKcWr0PHczIKzGZPV3Njo=" }, "neochat": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/neochat-24.02.2.tar.xz", - "hash": "sha256-ttzo+WvhK6sNdiaU9QxJzqGNYVXh5GVJ8L+XBG8EdB4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/neochat-24.05.0.tar.xz", + "hash": "sha256-kA7O70X1eM2HytkrRzbYblwYHF+TMKb3eVb9KmQj0bE=" }, "okular": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/okular-24.02.2.tar.xz", - "hash": "sha256-Qx02tyvsOVS1P2Jf+FB0Dp3/AIewO8e3FpnKRq7vBN4=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/okular-24.05.0.tar.xz", + "hash": "sha256-bzIveN4qoKQHk1H+RlHAgL2Y0n7rf53MN3ZScbSjrIA=" }, "palapeli": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/palapeli-24.02.2.tar.xz", - "hash": "sha256-0sV6qCFP5+SzuuO60XEup+101nUV4QqjvuEJwB90fK0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/palapeli-24.05.0.tar.xz", + "hash": "sha256-XlfWhWUntYONFmC92pBddhIoSdOTijHHG3J0j3jSeXw=" }, "parley": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/parley-24.02.2.tar.xz", - "hash": "sha256-uU48aURlDTvxGKv7xAK2u+VQGYfn+EHCdH6hEwkRGHo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/parley-24.05.0.tar.xz", + "hash": "sha256-PKGy4dkjtq58NhV3pMXkgf8ZaA9NVStLHi8ZBbTFF2A=" }, "partitionmanager": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/partitionmanager-24.02.2.tar.xz", - "hash": "sha256-AstyAIyv3JnbV0LaoN9jS26gfc7z+kQKJD5WKKk49Qk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/partitionmanager-24.05.0.tar.xz", + "hash": "sha256-aC8DAiE9lbYoBkImz8ztaqKZvIG37Uam5wXoEQMfumY=" }, "picmi": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/picmi-24.02.2.tar.xz", - "hash": "sha256-z25UFcpfH2VV0jHY8EFja34KdI1MFDqbbrvFc5E9IY0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/picmi-24.05.0.tar.xz", + "hash": "sha256-9j57xfJy66hNrOcTCOhtlhT/bhCQyuThol1gGSYpJPc=" }, "pimcommon": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/pimcommon-24.02.2.tar.xz", - "hash": "sha256-RkDcJ2+aDmsMJeJYFdc7fMZYyNc91QTSlelqWDon13A=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/pimcommon-24.05.0.tar.xz", + "hash": "sha256-YuWnQdCFYysgY4KCoE4szSqsqIfDYOIkRLXcux+WHB8=" }, "pim-data-exporter": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/pim-data-exporter-24.02.2.tar.xz", - "hash": "sha256-DhLQWrX6E+idNjSbDXrtHH0yX/dLSAsCXtoHa5CmEH8=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/pim-data-exporter-24.05.0.tar.xz", + "hash": "sha256-5sWx1etc8CT7NpL6JPl4rE9MS9vg89D8I0/OjCRp8us=" }, "pim-sieve-editor": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/pim-sieve-editor-24.02.2.tar.xz", - "hash": "sha256-yDZmqQPZKsTDdxzlWV+LuiHJwYVcuD9z6urg2Hu2fHg=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/pim-sieve-editor-24.05.0.tar.xz", + "hash": "sha256-D8AMmlMamZjwMajmUXw7mnV3sTn0Ch7T9Mijb2i3tU8=" }, "plasmatube": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/plasmatube-24.02.2.tar.xz", - "hash": "sha256-r4qz1B0pArFnBcgrj0yidM8UVSDe7HR/i/tG5rTDOds=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/plasmatube-24.05.0.tar.xz", + "hash": "sha256-MSG73rDjj4j4bw4Hz0fHuIuCE73B9XSJo33SeSjBEcE=" }, "poxml": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/poxml-24.02.2.tar.xz", - "hash": "sha256-pWtION445HNcSuKDMWnL88lH8JPD6MDWISR/X5NqymU=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/poxml-24.05.0.tar.xz", + "hash": "sha256-JyCI4b7NhP8LCQSje/8ADYuFqvJP+m717wTy8OnjSAI=" }, "qmlkonsole": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/qmlkonsole-24.02.2.tar.xz", - "hash": "sha256-zoGK52uRhbhEilGF8zCddqhejaWs9O6Iw8nEC4E8kVE=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/qmlkonsole-24.05.0.tar.xz", + "hash": "sha256-TjFF/dst8SF5Oo9Sw1WQqWh1n2EaeY2PRKndoB0dQkI=" }, "rocs": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/rocs-24.02.2.tar.xz", - "hash": "sha256-RKFjEH3xK1J0P0axjz4ZD+YqmwSQLTxEHdIDJzbEgws=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/rocs-24.05.0.tar.xz", + "hash": "sha256-g0aIUZokMLnjZ8ONfm1cY2SgUFlE0OV01RMApyuTkUA=" }, "signon-kwallet-extension": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/signon-kwallet-extension-24.02.2.tar.xz", - "hash": "sha256-NzJ14jnYh9WO1FAsLsBBexyhR1fpe8aCfcBjMyKpduI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/signon-kwallet-extension-24.05.0.tar.xz", + "hash": "sha256-si4GLHPeP4cHwI25OIQV4nxAwF5w9SWMS1/t0E7Yr8c=" }, "skanlite": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/skanlite-24.02.2.tar.xz", - "hash": "sha256-2avHcXkLtVWM195kU5d3QNaNnTCeTulj0qHCon/XY8A=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/skanlite-24.05.0.tar.xz", + "hash": "sha256-pu97eo60pg7fpfyzkrgn9JA4nqA2TtaTYPaccj1rP8w=" }, "skanpage": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/skanpage-24.02.2.tar.xz", - "hash": "sha256-pzYf6EbnjdrAKQ2Va08AM3S7s1SURtRahKYvP2pXMdo=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/skanpage-24.05.0.tar.xz", + "hash": "sha256-LHQeX0dvcBPoMvmWt5p07uyiW1bpLRUs7MXe2F1IO2E=" + }, + "skladnik": { + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/skladnik-24.05.0.tar.xz", + "hash": "sha256-wilw2+3JhVGV8H6H5VQIPNADTEFC03sgnN/0W5ZKev8=" }, "spectacle": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/spectacle-24.02.2.tar.xz", - "hash": "sha256-QRj3NV6wWE3rKojORuznthaIA5fwqyuBDL5MvCF0IVI=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/spectacle-24.05.0.tar.xz", + "hash": "sha256-3vKFHo2zzADqsIENmIAUsVuPI7R0uTKxzfPGFEMm1ao=" }, "step": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/step-24.02.2.tar.xz", - "hash": "sha256-KAp/Edl34wd4bnDDSiSdkHS7rdNpVlt1ZgbszPsMHsw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/step-24.05.0.tar.xz", + "hash": "sha256-X0rorwWFTJzKQlaSXXeEpBU7koHsRCFB8pmmU8MgzMk=" }, "svgpart": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/svgpart-24.02.2.tar.xz", - "hash": "sha256-T4YPwUGYT++ySdgFB8g65nFxmCyFJUXzOV8/lyMQLig=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/svgpart-24.05.0.tar.xz", + "hash": "sha256-fQJDisOw2I5ZplPyMC0dvHolNc5ifUnrUKOjOFLbQtQ=" }, "sweeper": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/sweeper-24.02.2.tar.xz", - "hash": "sha256-E3VYgubBLoxXZVA1x+XzbQUsPAv8tAscBnvjuT99rd0=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/sweeper-24.05.0.tar.xz", + "hash": "sha256-aQHCD2D+86/dMrJWoGJVQZhCREfadgaXBht1wQQyVlY=" }, "telly-skout": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/telly-skout-24.02.2.tar.xz", - "hash": "sha256-Paq1Y+MXBylEky90HON3UIZ/5J8bFqu3DA7EoXPES6k=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/telly-skout-24.05.0.tar.xz", + "hash": "sha256-cKZ5kC2uPK90lA80JKDm0hnVDYsMbl3fnIz29/d+zh8=" }, "tokodon": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/tokodon-24.02.2.tar.xz", - "hash": "sha256-DKM7AnT+GHyReYg2N1Opth1NOYO2+F8r4rJEA/nGkzs=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/tokodon-24.05.0.tar.xz", + "hash": "sha256-V1zH08/m0otpOQtswgpPpUHTIM2M/ISvwZL+CU4dnuo=" }, "umbrello": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/umbrello-24.02.2.tar.xz", - "hash": "sha256-iS0Lv2KkpD3SLWH4IHqsASu+sg2DAbfnBRaw2VYXVCw=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/umbrello-24.05.0.tar.xz", + "hash": "sha256-5VStctZd8p3/sXLMaFEWejiUyyCo077wVO0niPwavro=" }, "yakuake": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/yakuake-24.02.2.tar.xz", - "hash": "sha256-5F7g0F8iVD/UVl5C6MsgtQIIYte7pvM+ZFAH/GDWRlk=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/yakuake-24.05.0.tar.xz", + "hash": "sha256-ETwtDuNUoSq2yjRp/mjAhiF2iNwu5oAzX//kx52a+6I=" }, "zanshin": { - "version": "24.02.2", - "url": "mirror://kde/stable/release-service/24.02.2/src/zanshin-24.02.2.tar.xz", - "hash": "sha256-S6kd+7DlivXsZPRpVjE1ZinwicIkG7ewxb3Bw7mqJ+E=" + "version": "24.05.0", + "url": "mirror://kde/stable/release-service/24.05.0/src/zanshin-24.05.0.tar.xz", + "hash": "sha256-PSE+XCfIizH3x46EexclmfsyodhvFMmsCZE46nKyHho=" } } \ No newline at end of file diff --git a/pkgs/kde/gear/kio-extras-kf5/default.nix b/pkgs/kde/misc/kio-extras-kf5/default.nix similarity index 69% rename from pkgs/kde/gear/kio-extras-kf5/default.nix rename to pkgs/kde/misc/kio-extras-kf5/default.nix index d92f7a61b8a2..886ae1a62777 100644 --- a/pkgs/kde/gear/kio-extras-kf5/default.nix +++ b/pkgs/kde/misc/kio-extras-kf5/default.nix @@ -1,6 +1,6 @@ { stdenv, - sources, + fetchurl, kio-extras, cmake, libsForQt5, @@ -14,11 +14,16 @@ taglib, libappimage, }: +# kio-extras-kf5 is kind of part of Gear, but also not released all the time, +# so handle it separately. stdenv.mkDerivation rec { pname = "kio-extras-kf5"; - inherit (sources.${pname}) version; + version = "24.02.2"; - src = sources.${pname}; + src = fetchurl { + url = "mirror://kde/stable/release-service/${version}/src/kio-extras-kf5-${version}.tar.xz"; + hash = "sha256-qar1jzuALINBu6HOuVBU+RUFnqRH9Z/8e5M8ynGxKsk="; + }; nativeBuildInputs = with libsForQt5; [ cmake From 3b70ff975de01550f80860184d3d3deae997bbba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 15:55:06 +0000 Subject: [PATCH 293/311] bazel-buildtools: 7.1.1 -> 7.1.2 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 65574129ab93..f5b3e03f8609 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "7.1.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-funwP4D8ck7RT+0z+42MVud/3Da6HvVhFLTqQIucHrQ="; + hash = "sha256-Ax7UKkClYsoqxaR+tsQnTv6BFafl9SkY7MC4kYJNmwY="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; From cddbd427672e9e99bb9a8bf02b42ff59ee064bf3 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 23 May 2024 17:29:00 +0100 Subject: [PATCH 294/311] google-chrome: 125.0.6422.60 -> 125.0.6422.76 --- pkgs/by-name/go/google-chrome/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index bd0a31aadf3b..4d3ece104a78 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "125.0.6422.60"; + version = "125.0.6422.76"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Q0QMPthJLVquJp7fm6QN+lDb0quZsT7hv6KRXfdBMl4="; + hash = "sha256-hLGEwaTx11tqiS7skoNVwCEw+1GZ0pNHpfe11IFjTFc="; }; nativeBuildInputs = [ patchelf makeWrapper ]; From 197d6261ebf862d7375d61b9973dfa4e10606103 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 5 May 2024 01:26:40 -0400 Subject: [PATCH 295/311] python311Packages.sphinxcontrib-ditaa: init at 1.0.2 Co-authored-by: OTABI Tomoya --- .../sphinxcontrib-ditaa/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix new file mode 100644 index 000000000000..db263eab0f5b --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + unittestCheckHook, + setuptools, + sphinx, + ditaa, +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-ditaa"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-V/LhOwWbOP3olYC+ypFqxsp0VrLXBsPd6p3UiQ5fW9M="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + sphinx + ditaa + ]; + + # no tests provided + doCheck = false; + + # ? needs docutils exported as runtime dep + #pythonImportsCheck = [ "sphinxcontrib.ditaa" ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = { + description = "Sphinx ditaa extension"; + homepage = "https://pypi.org/project/sphinxcontrib-ditaa"; + maintainers = with lib.maintainers; [ rconybea ]; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5e00ae23405..c4937b1a30dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14283,6 +14283,8 @@ self: super: with self; { sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + sphinxcontrib-ditaa = callPackage ../development/python-modules/sphinxcontrib-ditaa { }; + sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { }; sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; From 72d5d19b5789b5dd92c31fbe4cf6dd26704f62db Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 23 May 2024 18:54:49 +0200 Subject: [PATCH 296/311] stalwart-mail: 0.8.0 -> 0.8.1 --- pkgs/by-name/st/stalwart-mail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 8fb02098f0b5..d021afe01f64 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -22,7 +22,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.8.0"; + version = "0.8.1"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -32,11 +32,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-V6Gl59938AplFW7pbrbGWB42+zRQBEaTUSW0+TMBo8I="; + hash = "sha256-al2+/+HPbjJ30rju2ih/yFZgmTdO2bQ6jDv+dtoIqsc="; fetchSubmodules = true; }; - cargoHash = "sha256-LWA08GNCrDlSwcSAlAi58OkoLs41fL6J5DPCsacozsM="; + cargoHash = "sha256-ek9vPo/M4peDcDkfzjXoKlJ+gFZUiREwNflOKEJNaWQ="; nativeBuildInputs = [ pkg-config From c64e560c86276d33f141703e9125a91fb817dbb8 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 23 May 2024 19:25:12 +0200 Subject: [PATCH 297/311] nixos/hydra: fix typo in hydra init script --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 23f07eb64b92..b516c3d6192c 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -335,7 +335,7 @@ in mkdir -m 0700 -p ${baseDir}/queue-runner mkdir -m 0750 -p ${baseDir}/build-logs mkdir -m 0750 -p ${baseDir}/runcommand-logs - chown hydra-queue-runner.hydra \ + chown hydra-queue-runner:hydra \ ${baseDir}/queue-runner \ ${baseDir}/build-logs \ ${baseDir}/runcommand-logs From 7ebf5ff345cbc90245b23336378cb9e98047e17b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:26:57 +0000 Subject: [PATCH 298/311] govulncheck: 1.1.0 -> 1.1.1 --- pkgs/tools/security/govulncheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 166e6dd53963..1151ee52bd5b 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "govulncheck"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; rev = "refs/tags/v${version}"; - hash = "sha256-sS58HyrwyRv3zYi8OgiDYnKSbyu2i3KVoSX/0wQbqGw="; + hash = "sha256-aDt4TCbs5yBeJu/Fr95uI3BvPBaclnQMuJYPUXT7S+I="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-ZHf//khvBGG+gRBKoKZo4NKoIJCQsbQfe2uT7cAHDcM="; + vendorHash = "sha256-YsZ9CchThybwgUjBg6hDQZ0bEEO18lidbGf9CIfzICc="; subPackages = [ "cmd/govulncheck" From cfafdab46c101dc901981863504d7e1c5c13cb22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 17:28:17 +0000 Subject: [PATCH 299/311] nextdns: 1.43.3 -> 1.43.4 --- pkgs/applications/networking/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 0661a3f9db2c..fe39929ce7b8 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.43.3"; + version = "1.43.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-sltTvjEfUZsmXDEyN+Zyck7oqZ+Xu8xScNnitt/0eic="; + sha256 = "sha256-nL+6pIH/tI/V14aKrQfwI+JJhCc/YD18U/J0SXnA9NE="; }; vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; From d4a518318044dbb3c842905ca4ab42f6ed544c5b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Apr 2024 19:26:47 +0200 Subject: [PATCH 300/311] ayatana-indicator-display: init at 24.5.0 --- nixos/tests/ayatana-indicators.nix | 3 +- .../ay/ayatana-indicator-display/package.nix | 124 ++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ay/ayatana-indicator-display/package.nix diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix index 1ca3e1dda3d3..cfd4d8099d11 100644 --- a/nixos/tests/ayatana-indicators.nix +++ b/nixos/tests/ayatana-indicators.nix @@ -28,6 +28,7 @@ in { enable = true; packages = with pkgs; [ ayatana-indicator-datetime + ayatana-indicator-display ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session @@ -95,7 +96,7 @@ in { # Now check if all indicators were brought up successfully, and kill them for later '' + (runCommandOverAyatanaIndicators (service: let serviceExec = builtins.replaceStrings [ "." ] [ "-" ] service; in '' - machine.succeed("pgrep -u ${user} -f ${serviceExec}") + machine.wait_until_succeeds("pgrep -u ${user} -f ${serviceExec}") machine.succeed("pkill -f ${serviceExec}") '')) + '' diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix new file mode 100644 index 000000000000..8c5e5c9e5160 --- /dev/null +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -0,0 +1,124 @@ +{ stdenv +, lib +, gitUpdater +, fetchFromGitHub +, nixosTests +, accountsservice +, cmake +, cppcheck +, dbus +, geoclue2 +, glib +, gsettings-desktop-schemas +, gtest +, intltool +, libayatana-common +, libgudev +, libqtdbusmock +, libqtdbustest +, libsForQt5 +, lomiri +, mate +, pkg-config +, properties-cpp +, python3 +, systemd +, wrapGAppsHook3 +, xsct +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ayatana-indicator-display"; + version = "24.5.0"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-indicator-display"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-ZEmJJtVK1dHIrY0C6pqVu1N5PmQtYqX0K5v5LvzNfFA="; + }; + + postPatch = '' + # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc + substituteInPlace data/CMakeLists.txt \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'DESTINATION "/etc' 'DESTINATION "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' + + # Hardcode xsct path + substituteInPlace src/service.cpp \ + --replace-fail 'sCommand = g_strdup_printf ("xsct' 'sCommand = g_strdup_printf ("${lib.getExe xsct}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # for schema discovery + intltool + pkg-config + wrapGAppsHook3 + ]; + + # TODO Can we get around requiring every desktop's schemas just to avoid segfaulting on some systems? + buildInputs = [ + accountsservice + geoclue2 + gsettings-desktop-schemas # gnome schemas + glib + libayatana-common + libgudev + libsForQt5.qtbase + systemd + ] ++ (with lomiri; [ + cmake-extras + lomiri-schemas # lomiri schema + ]) ++ (with mate; [ + mate.marco # marco schema + mate.mate-settings-daemon # mate mouse schema + ]); + + nativeCheckInputs = [ + cppcheck + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + gtest + libqtdbusmock + libqtdbustest + properties-cpp + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_COLOR_TEMP" true) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + ayatana-indicators = [ "ayatana-indicator-display" ]; + tests.vm = nixosTests.ayatana-indicators; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Ayatana Indicator for Display configuration"; + longDescription = '' + This Ayatana Indicator is designed to be placed on the right side of a + panel and give the user easy control for changing their display settings. + ''; + homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-display"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-display/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.linux; + }; +}) From d29e469f2a129a40b232760d0cd282f36a0cdaf9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 20 Apr 2024 10:58:17 +0200 Subject: [PATCH 301/311] nixos/lomiri: Add display indicator --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + nixos/tests/lomiri.nix | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index d16c3c750da6..06930b15a008 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -72,6 +72,7 @@ in { enable = true; packages = (with pkgs; [ ayatana-indicator-datetime + ayatana-indicator-display ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index b0be3baa20fb..6ae1e1c666d9 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -290,7 +290,7 @@ in { # There's a test app we could use that also displays their contents, but it's abit inconsistent. with subtest("ayatana indicators work"): mouse_click(735, 0) # the cog in the top-right, for the session indicator - machine.wait_for_text(r"(Notifications|Battery|Sound|Time|Date|System)") + machine.wait_for_text(r"(Notifications|Rotation|Battery|Sound|Time|Date|System)") machine.screenshot("indicators_open") # Indicator order within the menus *should* be fixed based on per-indicator order setting @@ -299,10 +299,16 @@ in { machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there - with subtest("lomiri indicator network works"): + with subtest("ayatana indicator display works"): # We start on this, don't go right + machine.wait_for_text("Lock") + machine.screenshot("indicators_display") + + with subtest("lomiri indicator network works"): + machine.send_key("right") machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") From 01152519d6cde79a4077d0cf98cf80e2acf8ebdc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 23 May 2024 20:40:15 +0200 Subject: [PATCH 302/311] nixos/tests/lomiri: Fix sound indicator subtest name It's an ayatana one, not a lomiri one. --- nixos/tests/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 6ae1e1c666d9..99f04a303be3 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -312,7 +312,7 @@ in { machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") - with subtest("lomiri indicator sound works"): + with subtest("ayatana indicator sound works"): machine.send_key("right") machine.wait_for_text(r"(Silent|Volume)") machine.screenshot("indicators_sound") From 69b8e69de7b66d4b09ca420cbb413c7001d977dc Mon Sep 17 00:00:00 2001 From: cjshearer Date: Mon, 6 May 2024 10:12:48 -0400 Subject: [PATCH 303/311] ideamaker: init at 4.3.3 --- pkgs/by-name/id/ideamaker/mimetypes.xml | 25 +++ pkgs/by-name/id/ideamaker/package.nix | 225 ++++++++++++++++++++++++ 2 files changed, 250 insertions(+) create mode 100644 pkgs/by-name/id/ideamaker/mimetypes.xml create mode 100644 pkgs/by-name/id/ideamaker/package.nix diff --git a/pkgs/by-name/id/ideamaker/mimetypes.xml b/pkgs/by-name/id/ideamaker/mimetypes.xml new file mode 100644 index 000000000000..1bef9f862f73 --- /dev/null +++ b/pkgs/by-name/id/ideamaker/mimetypes.xml @@ -0,0 +1,25 @@ + + + + + + + + + IDEA project + + + + + + + + + + + + + + + + diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix new file mode 100644 index 000000000000..42f18c6dd669 --- /dev/null +++ b/pkgs/by-name/id/ideamaker/package.nix @@ -0,0 +1,225 @@ +{ + stdenv, + autoPatchelfHook, + cacert, + common-updater-scripts, + curl, + dpkg, + fetchurl, + fetchzip, + lib, + libcork, + libGLU, + libsForQt5, + makeDesktopItem, + openssl, + shared-mime-info, + writeShellApplication, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ideamaker"; + version = "4.3.3.6560"; + src = + let + semver = lib.strings.concatStringsSep "." ( + lib.lists.init (builtins.splitVersion finalAttrs.version) + ); + in + fetchurl { + url = "https://download.raise3d.com/${finalAttrs.pname}/release/${semver}/ideaMaker_${finalAttrs.version}-ubuntu_amd64.deb"; + sha256 = "sha256-aTVWCTgnVKD16uhJUVz0vR7KPGJqCVj0xoL53Qi3IKM="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + shared-mime-info + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = + let + # we need curl 7.47.0, as the app segfaults on launch in 7.47.1 and beyond + # (tested with 7.47.1, 7.50.3, 7.62, 7.79.1, and 8.7.1) + curl_7_47_0 = + let + openssl_1_0_1u = openssl.overrideAttrs (previous: { + version = "1.0.1u"; + src = fetchurl { + url = "https://www.openssl.org/source/openssl-1.0.1u.tar.gz"; + sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; + }; + patches = [ ]; + withDocs = false; + outputs = lib.lists.remove "doc" previous.outputs; + meta.knownVulnerabilities = [ + "OpenSSL 1.0.1 reached its end of life 2016-12-31, see https://endoflife.software/applications/security-libraries/openssl." + "CVE-2021-4044" + "CVE-2016-7056" + ]; + }); + in + (curl.override { + gnutlsSupport = true; + gssSupport = false; + http2Support = false; + # while we use openssl, the configureFlag has since changed, so we manually set it below + opensslSupport = false; + pslSupport = false; + scpSupport = false; + }).overrideAttrs + (previous: { + version = "7.47.0"; + src = fetchzip { + url = "https://curl.se/download/curl-7.47.0.tar.lzma"; + sha256 = "sha256-XlZk1nJbSmiQp7jMSE2QRCY4C9w2us8BgosBSzlD4dE="; + }; + configureFlags = previous.configureFlags ++ [ + "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" + "--with-ssl=${lib.getLib openssl_1_0_1u}" + ]; + patches = [ ]; + # curl https://curl.se/docs/vuln-7.74.0.json | jq -r '.[].id' | sed 's/^/"/;s/$/"/' + meta.knownVulnerabilities = [ + "CURL-CVE-2024-2398" + "CURL-CVE-2023-46218" + "CURL-CVE-2023-38546" + "CURL-CVE-2023-38545" + "CURL-CVE-2023-28322" + "CURL-CVE-2023-28321" + "CURL-CVE-2023-28320" + "CURL-CVE-2023-27538" + "CURL-CVE-2023-27536" + "CURL-CVE-2023-27535" + "CURL-CVE-2023-27534" + "CURL-CVE-2023-27533" + "CURL-CVE-2023-23916" + "CURL-CVE-2022-43552" + "CURL-CVE-2022-32221" + "CURL-CVE-2022-35252" + "CURL-CVE-2022-32208" + "CURL-CVE-2022-32207" + "CURL-CVE-2022-32206" + "CURL-CVE-2022-32205" + "CURL-CVE-2022-27782" + "CURL-CVE-2022-27781" + "CURL-CVE-2022-27776" + "CURL-CVE-2022-27775" + "CURL-CVE-2022-27774" + "CURL-CVE-2022-22576" + "CURL-CVE-2021-22947" + "CURL-CVE-2021-22946" + "CURL-CVE-2021-22945" + "CURL-CVE-2021-22926" + "CURL-CVE-2021-22925" + "CURL-CVE-2021-22924" + "CURL-CVE-2021-22923" + "CURL-CVE-2021-22922" + "CURL-CVE-2021-22898" + "CURL-CVE-2021-22897" + "CURL-CVE-2021-22890" + "CURL-CVE-2021-22876" + ]; + }); + in + [ + (lib.getLib curl_7_47_0) + libcork + libGLU + libsForQt5.qtbase + libsForQt5.qtserialport + libsForQt5.quazip + ]; + + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + install -D usr/lib/x86_64-linux-gnu/ideamaker/ideamaker \ + $out/bin/${finalAttrs.pname} + + patchelf --replace-needed libquazip.so.1 libquazip1-qt5.so \ + $out/bin/${finalAttrs.pname} + + mimetypeDir=$out/share/icons/hicolor/128x128/mimetypes + mkdir -p ''$mimetypeDir + for file in usr/share/ideamaker/icons/*.ico; do + mv $file ''$mimetypeDir/''$(basename ''${file%.ico}).png + done + install -D ${./mimetypes.xml} \ + $out/share/mime/packages/${finalAttrs.pname}.xml + + install -D usr/share/ideamaker/icons/ideamaker-icon.png \ + $out/share/pixmaps/${finalAttrs.pname}.png + + ln -s ${finalAttrs.desktopItem}/share/applications $out/share/ + + runHook postInstall + ''; + + desktopItem = makeDesktopItem { + name = finalAttrs.pname; + exec = finalAttrs.pname; + icon = finalAttrs.pname; + desktopName = "Ideamaker"; + comment = "ideaMaker - www.raise3d.com"; + categories = [ + "Qt" + "Utility" + "3DGraphics" + "Viewer" + "Engineering" + ]; + genericName = finalAttrs.meta.description; + mimeTypes = [ + "application/x-ideamaker" + "model/3mf" + "model/obj" + "model/stl" + "text/x.gcode" + ]; + noDisplay = false; + startupNotify = true; + terminal = false; + type = "Application"; + }; + + passthru.updateScript = lib.getExe (writeShellApplication { + name = "ideamaker-update-script"; + runtimeInputs = [ + curl + common-updater-scripts + ]; + text = '' + set -eu -o pipefail + + release_page=$(mktemp) + curl -s https://www.raise3d.com/download/ideamaker-all-versions/ > "$release_page" + + latest_stable_version=$( + sed -nE '/Beta|Alpha/! s/.*Version ([0-9]+\.[0-9]+\.[0-9]+).*/\1/p' "$release_page" | \ + head -n 1 + ) + + latest_stable_build_number=$( + sed -nE "s/.*ideaMaker_$latest_stable_version\.([0-9]+).*/\1/p" "$release_page" | head -n 1 + ) + + update-source-version ideamaker "$latest_stable_version.$latest_stable_build_number" + ''; + }); + + meta = { + homepage = "https://www.raise3d.com/ideamaker/"; + description = "Raise3D's 3D slicer software"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ cjshearer ]; + }; +}) From 30e7e4163bb4fee3e816f917ce3cad29bd4447a3 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 May 2024 13:58:35 -0300 Subject: [PATCH 304/311] bicep: 0.26.54 -> 0.27.1 Release: https://github.com/Azure/bicep/releases/tag/v0.27.1 --- pkgs/by-name/bi/bicep/deps.nix | 126 +++++++++--------------------- pkgs/by-name/bi/bicep/package.nix | 4 +- 2 files changed, 38 insertions(+), 92 deletions(-) diff --git a/pkgs/by-name/bi/bicep/deps.nix b/pkgs/by-name/bi/bicep/deps.nix index 78b0b2c1b727..490fd2cf150c 100644 --- a/pkgs/by-name/bi/bicep/deps.nix +++ b/pkgs/by-name/bi/bicep/deps.nix @@ -3,27 +3,30 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Azure.Bicep.Internal.RoslynAnalyzers"; version = "0.1.38"; sha256 = "1b13vbl0y851nr7rfhyxc0djihxfr7xv010f9zvvbibyz5wqis7v"; }) - (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.6"; sha256 = "0kzyy21jvhc6gy24w9sfb6ic0pg22j8y6s23q8ls0i15qf3rng77"; }) - (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.677"; sha256 = "1wgng31pfm272yipigjz24ky2qfrq7mfj9fx0wbyr3q8g6cascnp"; }) + (fetchNuGet { pname = "Azure.Bicep.Types"; version = "0.5.9"; sha256 = "02v5jzrap5flk5r6jwbw3mzvkxb51kmz4g71j2nnikqgnc4v5dh2"; }) + (fetchNuGet { pname = "Azure.Bicep.Types.Az"; version = "0.2.686"; sha256 = "08yv067s9cccr7brsw85mdgbq0cyw39vmbmfxcvhhnvrgd7g4mgf"; }) (fetchNuGet { pname = "Azure.Bicep.Types.K8s"; version = "0.1.626"; sha256 = "1c07igq6jqxkg9iln452fnng2n6ddd0008vb5lgbzdpgp1amz2ji"; }) (fetchNuGet { pname = "Azure.Containers.ContainerRegistry"; version = "1.1.1"; sha256 = "0hn6mq1bffcq7d5w4rj4ffdxb3grvymzrpyl1qrbxksqpfbd0bh4"; }) (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; }) - (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.0.1158"; sha256 = "07bjwmal3qy23axa9g0gsc5qdajypvbpys15k8y05gnflz85rqzy"; }) - (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.0.1158"; sha256 = "1kn515apm33fmrdz8v9y8ac2w83cbbvf74w2grrl1aimg5n4qjsb"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.38.0"; sha256 = "1rnnip757kdzipfvrz9qc730mpkcq8r36lspwx20p0s9hss8qdc3"; }) + (fetchNuGet { pname = "Azure.Core"; version = "1.39.0"; sha256 = "0b36vi12pzqls6ad1dwzc8zq8wb07rkg2y52divl8gh2za43x5wp"; }) + (fetchNuGet { pname = "Azure.Deployments.Core"; version = "1.0.1243.1"; sha256 = "18lh45y9axc494hpxdp8w6d8c92n8m6k4lqjyh4znd2mcmm57wbz"; }) + (fetchNuGet { pname = "Azure.Deployments.Expression"; version = "1.0.1243.1"; sha256 = "1shk9amp9d3v6lbf2s0j1fxf5xm468fvphhnni95v6w2cpv1fdv8"; }) (fetchNuGet { pname = "Azure.Deployments.Internal.GenerateNotice"; version = "0.1.38"; sha256 = "00jzm0c1ch24mh50hqmzs2jxda929zg1j1dgnhs5gbsyk7zjlvrd"; }) - (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.0.1158"; sha256 = "1zww735mbw1jswd3l8m7y48giqkcxn9v1fy9g6kp3c4dr97519wq"; }) - (fetchNuGet { pname = "Azure.Identity"; version = "1.10.4"; sha256 = "0w345hzp43wbs5f5qk1y7wmyp11cayphnycpflil5ayvvz2jjfn2"; }) - (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.9.0"; sha256 = "143rv7rq16q4b4fhh3yjjc5r4g226jhpl6ngwvr69kbbxhw0n618"; }) - (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.0"; sha256 = "1hjbb607fxb26c7bxx1lc3v50hxmv446klg7c1k89a7wkiqgvmh9"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.1"; sha256 = "12xiib5p8f4aj9gz0jn6s96lsa172qi92j46rrb39sidh0mbbdil"; }) + (fetchNuGet { pname = "Azure.Deployments.Templates"; version = "1.0.1243.1"; sha256 = "11glwwxq9xzi3vrnqx833dry9n6ykspf6gfab0g23d8fygd5d2rf"; }) + (fetchNuGet { pname = "Azure.Identity"; version = "1.11.2"; sha256 = "1zb18p50l24nr9v0srywqq5cx6xbyrlcib1i244z9vmi1qkjia2h"; }) + (fetchNuGet { pname = "Azure.ResourceManager"; version = "1.11.1"; sha256 = "0vfp2rs4r9x3zkvw0za8q6xz3rrb8nywjd1137rpbpy0zx7qnbry"; }) + (fetchNuGet { pname = "Azure.ResourceManager.Resources"; version = "1.7.2"; sha256 = "1cw732wpixh4vrlznc70ld3d1hrw6smk57ar8imh4l7jvd9fn041"; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; sha256 = "0fll8yssdzi2wv8l26qz2zl0qqrp5nlbdqxjwfh5p356nd991m1d"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.12.0"; sha256 = "04fhn67930zv3i0d8xbrbw5vwz99c83bbvgdwqiir55vw5xlys9c"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "IPNetwork2"; version = "2.6.598"; sha256 = "03nxkiwy1bxgpv5n1lfd06grdyjc10a3k9gyc04rhzysjsswiy0l"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Json.More.Net"; version = "1.8.0"; sha256 = "1jlcmgn3pw4jzk9ys6jhkbigfdn9rrrb0wb2v0yxi5wv82arviq5"; }) - (fetchNuGet { pname = "Json.More.Net"; version = "1.9.2"; sha256 = "1w5xascr03iv7830vdrlpxjrxiabypaqkkcij118lfm41pqhw8b7"; }) - (fetchNuGet { pname = "JsonPatch.Net"; version = "2.1.0"; sha256 = "0ckz04108p7j8gzqs61bkvlbxfbqvbr19aykmkbbw44inr9azxai"; }) - (fetchNuGet { pname = "JsonPath.Net"; version = "0.7.0"; sha256 = "0lv9w9m8327hyjzqbl2mwv61zsimc8b114nc67jwv0lm9v29skm0"; }) - (fetchNuGet { pname = "JsonPointer.Net"; version = "3.0.1"; sha256 = "109q63pdsxdiy4rwj4qm1rj1cadxhksw3ik1frsrn2clkpj4lwks"; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.1"; sha256 = "0i6w5n075qhawqr832hl8bzsdspwkfkmfnnv94c9ilq06srvy1gc"; }) + (fetchNuGet { pname = "Json.More.Net"; version = "2.0.1.2"; sha256 = "1fzw9d55hvynrwz01gj0xv6ybjm7nsrm2vxqy6d15wr75w3pyyky"; }) + (fetchNuGet { pname = "JsonPatch.Net"; version = "3.0.0.2"; sha256 = "1pi7qvjpndgxiipn21hbqf0f5ff1rijhqkcjag8pg3lcyrlm1vnl"; }) + (fetchNuGet { pname = "JsonPath.Net"; version = "1.0.1.2"; sha256 = "0br6k35mwc1nisvma5izpig5mc8390fly12sics6yi82xyvhgqx5"; }) + (fetchNuGet { pname = "JsonPointer.Net"; version = "4.0.1.3"; sha256 = "06yvdiwz4j8rg42wlvlflaiq2qyhcm5r3x7gczjvfihfsydvj09f"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) @@ -39,7 +42,7 @@ (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "3.1.3"; sha256 = "1bappkn6vzaaq5yw9fzhds2gz557bhgmxvh38ifw6l39jkar2lii"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; sha256 = "0w5w0h1clv7585qkajy0vqb28blghhcv5j9ygfi13219idhx10r9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) @@ -52,18 +55,19 @@ (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.3-preview"; sha256 = "0y910m1gw4sn41qskhxf9lwhvqlg9wnpyj2frzj7nbgyxwdljrqk"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.56.0"; sha256 = "0rwyj8qagx93ys67a8k878ib3zdcrjb3jrl0aif3i8a0knwpsxxx"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.56.0"; sha256 = "1pcq46kfk3b1yyqr1rlk7sxd69xg0l9hrmard5nvqd7kh287l08m"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.Graph.Bicep.Types"; version = "0.1.5-preview"; sha256 = "0k26hh1mbrchmkymhf0in7g7dpgyzn2i1dfffi58w5wi5f25gsph"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "6.0.0.1485"; sha256 = "1dszc9fhg9xpp96gx5djg2azxvfb36551malysdgxvd2r23vvfwh"; }) + (fetchNuGet { pname = "Microsoft.PowerPlatform.ResourceStack"; version = "7.0.0.2007"; sha256 = "1higvig4ajwgcw6bdhxmf0s5p4gy1m69rnngdi1ik42731wrafay"; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "8.0.0"; sha256 = "0xrr8yd34ij7dqnyddkp2awfmf9qn3c89xmw2f3npaa4wnajmx81"; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "8.0.0"; sha256 = "1gdx7n45wwia3yvang3ls92sk3wrymqcx9p349j8wba2lyjf9m44"; }) (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) @@ -75,19 +79,17 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.7.35"; sha256 = "1sr2ydgl6clnpf7axjhnffx3z2jz1zhnxfiizsv1prl26r3y52f9"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.9.28"; sha256 = "0g64zn1wk96v9rj04rkcg7jwklaihj317gsdfswqg33yrcn4z5ig"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.48"; sha256 = "00p3ywq4ppfl14l9yzxl5id5zmay8fv42b4w3ppr1b3d5ipldxhj"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry.AccessControl"; version = "6.0.0"; sha256 = "1c1x47c6p21l6l84kw8wvsdhnd7ifrrrl8in0bnkaq7y1va4fvsn"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; sha256 = "1map729br97ny6mqkaw5qsg55yjbfz2hskvy56qz8rf7p1bjhky2"; }) (fetchNuGet { pname = "Microsoft.Windows.Compatibility"; version = "6.0.7"; sha256 = "1b01dg77mw2ih3dy5sajjvqd89zv4yjqffmb8gs7dpzwnncin91d"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.3.1"; sha256 = "1k706rfifdx28kxhnqpfhfc79zvzd7wnyqvf3g6r27p9ramzw3j9"; }) (fetchNuGet { pname = "Nerdbank.GitVersioning"; version = "3.6.133"; sha256 = "1cdw8krvsnx0n34f7fm5hiiy7bs6h3asvncqcikc0g46l50w2j80"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) @@ -96,7 +98,6 @@ (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) @@ -108,7 +109,6 @@ (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) @@ -117,42 +117,32 @@ (fetchNuGet { pname = "runtime.linux-x64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "0ss8fzqnvxps1ybfy70fj4vs2w78mizg4sxdriw8bvcdcfsv0rg2"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.Data.SqlClient.sni"; version = "4.7.0"; sha256 = "1b84b8rkwwwgvx1hh5r6icd975rl1ry3bc1xb87br2d8k433wgbj"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "0nl8z42aiqfz0v4h1lx84jz312n1f01rlr2kzd7yfiv7p7i1dl3w"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) (fetchNuGet { pname = "runtime.osx-arm64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "114swwc99lg4zjzywfcfxvbxynrlh9pvgl1wpihf88jbs2mjicw5"; }) (fetchNuGet { pname = "runtime.osx-x64.runtime.native.System.IO.Ports"; version = "6.0.0"; sha256 = "1kwip1pj1xaqrlkf5flkk30zn2lg4821g64nfj1glpjjcj49b3wv"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "runtime.win-arm64.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "07byf1iyqb7jkb17sp0mmjk46fwq6fx8mlpzywxl7qk09sma44gk"; }) (fetchNuGet { pname = "runtime.win-x64.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "0167s4mpq8bzk3y11pylnynzjr2nc84w96al9x4l8yrf34ccm18y"; }) (fetchNuGet { pname = "runtime.win-x86.runtime.native.System.Data.SqlClient.sni"; version = "4.4.0"; sha256 = "0k3rkfrlm9jjz56dra61jgxinb8zsqlqzik2sjwz7f8v6z6ddycc"; }) - (fetchNuGet { pname = "Sarif.Sdk"; version = "4.4.0"; sha256 = "0860mqyzcckvfg1air1pva5v9npzq6d2cn8bds8zqxg06jxq9gvy"; }) - (fetchNuGet { pname = "SharpYaml"; version = "2.1.0"; sha256 = "05qrppbhfyikv94vnzpb7x1y6yd3znkr8pc0vsmdgca6z6jsy2lq"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.8"; sha256 = "187zkhi7a81idma7gw072xxsikmvadkxszl48qzffsqzjz8y2wxb"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "Sarif.Sdk"; version = "4.5.4"; sha256 = "0bw2r6qndqj49x2g90rxyp966mdzik9355jgjan6ijib1rad2z2w"; }) + (fetchNuGet { pname = "SharpYaml"; version = "2.1.1"; sha256 = "171s60qpqj5r7krkn2zq6fg6f09ixsd5czrw91qm5lg3vpvknar9"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.11"; sha256 = "1y6pr2lcpqbwian0iiyf9bagwyx0l7dbarazk3cyah1fl3rrjaqd"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.ClientModel"; version = "1.0.0"; sha256 = "0rhbabgfnxx6qcaxq218h5si4gbq6sn4rgg6cn9bgw6rrzcgnxn8"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) @@ -160,20 +150,16 @@ (fetchNuGet { pname = "System.ComponentModel.Composition.Registration"; version = "6.0.0"; sha256 = "1lv5b42lssrkzbk2fz9phmdgwmqzi2n3yg3rl081q661nij3vv1l"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.4.0"; sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.1"; sha256 = "1d6cx49fzycbl2fam8d1j3491sqx6mh7qkb5ddrawr00x74hgzak"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Data.Odbc"; version = "6.0.1"; sha256 = "12g9fzx6y5gb1bb5lyfxin1d5snw69pdwv481x13m6qhkfhk3lx4"; }) (fetchNuGet { pname = "System.Data.OleDb"; version = "6.0.0"; sha256 = "0cbf6qw7k13rjrk5zfd158yri023ryaifd6fz5cbqgwdg4vpnvpz"; }) - (fetchNuGet { pname = "System.Data.SqlClient"; version = "4.8.5"; sha256 = "17g5snnjf4fy67ayqj8vqa4vz916njffahbc365z37l5v0w7g92a"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Data.SqlClient"; version = "4.8.6"; sha256 = "153wgkb8gcbqk00zsdj8lw8d4ms60h6k08n57yiyxlyyimrg5ks1"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "6.0.1"; sha256 = "17p5vwbgrycsrvv9a9ksxbiziy75x4s25dw71fnbw1ci5kpp8yz7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.DirectoryServices"; version = "6.0.1"; sha256 = "17abibzqmr4amxpnbpv198qzdpb5mafn655ayisfc4mmhmyks39a"; }) (fetchNuGet { pname = "System.DirectoryServices.AccountManagement"; version = "6.0.0"; sha256 = "1hvmasf4zsjpds0q8j8k5n61lr6mqhi37bsz1m65r6fs5kx5jrfn"; }) @@ -183,36 +169,22 @@ (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "20.0.15"; sha256 = "0lj2y0fpns0dgw9wfsx804qsm9i9g01hrdsws3pmlwzrin73ghyg"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mp73hkrxb83bs16458qgf7l3n20ddnfkij1pd603dr8w22j7279"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; sha256 = "112nq0k2jc4vh71rifqqmpjxkaanxfapk7g8947jkfgq3lmfmaac"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.IO.Ports"; version = "6.0.0"; sha256 = "0b0gvn7b2xsy2b0wwa170jzm5cwy3xxwpyqm21m4cbpc0ckri802"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Management"; version = "6.0.2"; sha256 = "190bxmg0y5dmzh0yv9gzh8k6safdz20gqaifpnl8v7yw3z5wcpgj"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; sha256 = "117vxa0pfgg6xfdxfpza4296ay7sqiaynyvfbsai43yrkh0lmch1"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) @@ -220,19 +192,14 @@ (fetchNuGet { pname = "System.Reflection.Context"; version = "6.0.0"; sha256 = "1vy3b143429amaa0501xjgdszvpdygkrs5rkivnrkl69f67dad5j"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; sha256 = "10yh3q2i71gcw7c0dfz9qxql2vlvnqjav1hyf1q9rpbvdbgsabrs"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) @@ -247,27 +214,16 @@ (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.ServiceModel.Duplex"; version = "4.9.0"; sha256 = "0jwbpcpgxv5zar3raypgvfnwvn4bv3n212cbcgyj7r0xj33c1kqi"; }) @@ -280,21 +236,17 @@ (fetchNuGet { pname = "System.Speech"; version = "6.0.0"; sha256 = "1g7b077189x9xy4l9yrh2yfnhc83mk6aj7b0v64xdqsrsqv1z16v"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.2"; sha256 = "1pi1dkypmn34qqspvwfcp1fx78v0nh78dpdyj4rcaa2qch40y15r"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.AccessControl"; version = "6.0.0"; sha256 = "1f036x8994yqz13a1cx6vvzd2bqzwy4mchn1pgfsybaw1xa10jk6"; }) @@ -302,17 +254,11 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Web.Services.Description"; version = "4.9.0"; sha256 = "08f9ksj826nz4pfw1bw7xg811x99yyj871nfmvav6yxfkx9faqkh"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "20.0.15"; sha256 = "14ivs6f91frvnygxg1qb7f7a96a3nazncj2sx4gsv1y22wmwizn4"; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "20.0.15"; sha256 = "0avsf5bwjq4ymjmri917w610xzv6l300fxq3h7xhfprs25crby3k"; }) - (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.3"; sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "21.0.2"; sha256 = "1mc358wlq9y21gzj44af8hxlyjm0ws0i9f5vmsn31dn5wbfh4dy5"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "21.0.2"; sha256 = "0q3vghssyh6rd7w7n4rjv5ngh5byf1y80i22yw9fx10f4hcsw1az"; }) ] diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index d91ffd7e5c6c..7cd6a06463f3 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.26.54"; + version = "0.27.1"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-Obu9I2FzuYBD466DE9VZnjTHSRX+qeKqTiIJ2433DQc="; + hash = "sha256-7yEsxKUG2jhki1u5CObdjN4JMnEcAYR+SoGPaNJ+9Fs="; }; projectFile = "src/Bicep.Cli/Bicep.Cli.csproj"; From 4c627d7adc3303ab9a5c272129c38dda585c6c54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 May 2024 20:32:29 +0000 Subject: [PATCH 305/311] surrealdb: 1.5.0 -> 1.5.1 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 0e881eeb7dac..0e598094c57c 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-MX7XE+1YCP6zSc207GAaFgr0QJLMX0dbFqGjLMf/KOI="; + hash = "sha256-piLanhc59jfsXHoaY217nqPahuyV2xtvlT4aqFNjaxM="; }; - cargoHash = "sha256-skPCmQVH76qdmBVd4IVCnKn1uHP7mEgJ8YXprycpQ5I="; + cargoHash = "sha256-dqbq7irajpDWsxCt1B8W6G+ulPJowpu2ykXMqQoT1Sw="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From a1090bebdcca0c8eb7f60c475f67ef7fedd471ff Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 22 May 2024 18:41:18 +0200 Subject: [PATCH 306/311] gobang: unbreak, modernize --- pkgs/by-name/go/gobang/package.nix | 40 + pkgs/by-name/go/gobang/update-sqlx.patch | 1553 +++++++++++++++++ .../tools/database/gobang/default.nix | 35 - pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1593 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/go/gobang/package.nix create mode 100644 pkgs/by-name/go/gobang/update-sqlx.patch delete mode 100644 pkgs/development/tools/database/gobang/default.nix diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix new file mode 100644 index 000000000000..9691aa78fd81 --- /dev/null +++ b/pkgs/by-name/go/gobang/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, +}: +let + version = "0.1.0-alpha.5"; +in +rustPlatform.buildRustPackage { + pname = "gobang"; + inherit version; + + src = fetchFromGitHub { + owner = "tako8ki"; + repo = "gobang"; + rev = "v${version}"; + hash = "sha256-RinfQhG7iCp0Xcs9kLs3I2/wjkJEgCjFYe3mS+FY9Ak="; + }; + + cargoPatches = [ ./update-sqlx.patch ]; + + cargoHash = "sha256-3A3bf7iq1acsWttKmcJmxWM74B0qUIcROBAkjDZFKxE="; + + buildInputs = + with darwin.apple_sdk.frameworks; + lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + SystemConfiguration + ]; + + meta = { + description = "A cross-platform TUI database management tool written in Rust"; + homepage = "https://github.com/tako8ki/gobang"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/by-name/go/gobang/update-sqlx.patch b/pkgs/by-name/go/gobang/update-sqlx.patch new file mode 100644 index 000000000000..1571b00f0339 --- /dev/null +++ b/pkgs/by-name/go/gobang/update-sqlx.patch @@ -0,0 +1,1553 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6cf1c13..c3ea64b 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,24 +4,15 @@ version = 3 + + [[package]] + name = "ahash" +-version = "0.7.4" ++version = "0.7.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" ++checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" + dependencies = [ + "getrandom", + "once_cell", + "version_check", + ] + +-[[package]] +-name = "aho-corasick" +-version = "0.7.18" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +-dependencies = [ +- "memchr", +-] +- + [[package]] + name = "ansi_term" + version = "0.11.0" +@@ -39,9 +30,9 @@ checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" + + [[package]] + name = "arrayvec" +-version = "0.5.2" ++version = "0.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + + [[package]] + name = "async-trait" +@@ -51,7 +42,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -74,12 +65,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "autocfg" +-version = "0.1.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +- + [[package]] + name = "autocfg" + version = "1.0.1" +@@ -92,31 +77,70 @@ version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + ++[[package]] ++name = "base64ct" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" ++ + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "bitvec" +-version = "0.19.5" ++name = "block-buffer" ++version = "0.10.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" ++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" + dependencies = [ +- "funty", +- "radium", +- "tap", +- "wyz", ++ "generic-array", + ] + + [[package]] +-name = "block-buffer" +-version = "0.9.0" ++name = "borsh" ++version = "0.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" + dependencies = [ +- "generic-array", ++ "borsh-derive", ++ "hashbrown 0.11.2", ++] ++ ++[[package]] ++name = "borsh-derive" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" ++dependencies = [ ++ "borsh-derive-internal", ++ "borsh-schema-derive-internal", ++ "proc-macro-crate", ++ "proc-macro2", ++ "syn 1.0.109", ++] ++ ++[[package]] ++name = "borsh-derive-internal" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ ++[[package]] ++name = "borsh-schema-derive-internal" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", + ] + + [[package]] +@@ -125,6 +149,28 @@ version = "3.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + ++[[package]] ++name = "bytecheck" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" ++dependencies = [ ++ "bytecheck_derive", ++ "ptr_meta", ++ "simdutf8", ++] ++ ++[[package]] ++name = "bytecheck_derive" ++version = "0.6.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ + [[package]] + name = "byteorder" + version = "1.4.3" +@@ -184,22 +230,18 @@ dependencies = [ + ] + + [[package]] +-name = "cpufeatures" +-version = "0.1.5" ++name = "const-oid" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +-dependencies = [ +- "libc", +-] ++checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + + [[package]] +-name = "crossbeam-channel" +-version = "0.5.1" ++name = "cpufeatures" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" + dependencies = [ +- "cfg-if", +- "crossbeam-utils", ++ "libc", + ] + + [[package]] +@@ -273,15 +315,25 @@ dependencies = [ + ] + + [[package]] +-name = "crypto-mac" +-version = "0.10.1" ++name = "crypto-bigint" ++version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" ++checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" + dependencies = [ + "generic-array", + "subtle", + ] + ++[[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 = "database-tree" + version = "0.1.0-alpha.5" +@@ -291,20 +343,33 @@ dependencies = [ + "thiserror", + ] + ++[[package]] ++name = "der" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" ++dependencies = [ ++ "const-oid", ++ "crypto-bigint", ++ "pem-rfc7468", ++] ++ + [[package]] + name = "digest" +-version = "0.9.0" ++version = "0.10.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" + dependencies = [ +- "generic-array", ++ "block-buffer", ++ "crypto-common", ++ "subtle", + ] + + [[package]] + name = "dirs" +-version = "3.0.2" ++version = "4.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" + dependencies = [ + "dirs-sys", + ] +@@ -359,6 +424,24 @@ version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + ++[[package]] ++name = "event-listener" ++version = "2.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "flume" ++version = "0.10.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++ "pin-project", ++ "spin 0.9.8", ++] ++ + [[package]] + name = "form_urlencoded" + version = "1.0.1" +@@ -369,12 +452,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "funty" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +- + [[package]] + name = "futures" + version = "0.3.15" +@@ -392,9 +469,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" ++checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" + dependencies = [ + "futures-core", + "futures-sink", +@@ -402,15 +479,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" ++checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + + [[package]] + name = "futures-executor" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" ++checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" + dependencies = [ + "futures-core", + "futures-task", +@@ -430,42 +507,39 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" ++checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + + [[package]] + name = "futures-macro" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" ++checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" + dependencies = [ +- "autocfg 1.0.1", +- "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" ++checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + + [[package]] + name = "futures-task" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" ++checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + + [[package]] + name = "futures-util" +-version = "0.3.15" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" ++checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" + dependencies = [ +- "autocfg 1.0.1", + "futures-channel", + "futures-core", + "futures-io", +@@ -475,8 +549,6 @@ dependencies = [ + "memchr", + "pin-project-lite", + "pin-utils", +- "proc-macro-hack", +- "proc-macro-nested", + "slab", + ] + +@@ -523,7 +595,7 @@ dependencies = [ + "strum", + "strum_macros", + "tokio", +- "toml", ++ "toml 0.4.10", + "tui", + "unicode-width", + "which", +@@ -538,13 +610,22 @@ dependencies = [ + "ahash", + ] + ++[[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.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" + dependencies = [ +- "hashbrown", ++ "hashbrown 0.11.2", + ] + + [[package]] +@@ -556,6 +637,15 @@ dependencies = [ + "unicode-segmentation", + ] + ++[[package]] ++name = "heck" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" ++dependencies = [ ++ "unicode-segmentation", ++] ++ + [[package]] + name = "hermit-abi" + version = "0.1.18" +@@ -571,13 +661,21 @@ version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + ++[[package]] ++name = "hkdf" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" ++dependencies = [ ++ "hmac", ++] ++ + [[package]] + name = "hmac" +-version = "0.10.1" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" ++checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" + dependencies = [ +- "crypto-mac", + "digest", + ] + +@@ -598,8 +696,8 @@ version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" + dependencies = [ +- "autocfg 1.0.1", +- "hashbrown", ++ "autocfg", ++ "hashbrown 0.11.2", + ] + + [[package]] +@@ -622,9 +720,9 @@ dependencies = [ + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +@@ -641,27 +739,14 @@ version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + dependencies = [ +- "spin", +-] +- +-[[package]] +-name = "lexical-core" +-version = "0.7.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +-dependencies = [ +- "arrayvec", +- "bitflags", +- "cfg-if", +- "ryu", +- "static_assertions", ++ "spin 0.5.2", + ] + + [[package]] + name = "libc" +-version = "0.2.97" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "libm" +@@ -671,9 +756,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" + + [[package]] + name = "libsqlite3-sys" +-version = "0.22.2" ++version = "0.24.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" ++checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" + dependencies = [ + "cc", + "pkg-config", +@@ -698,12 +783,6 @@ dependencies = [ + "cfg-if", + ] + +-[[package]] +-name = "maplit" +-version = "1.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +- + [[package]] + name = "matches" + version = "0.1.8" +@@ -712,20 +791,25 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "md-5" +-version = "0.9.1" ++version = "0.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" ++checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" + dependencies = [ +- "block-buffer", ++ "cfg-if", + "digest", +- "opaque-debug", + ] + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" ++ ++[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "mio" +@@ -751,15 +835,12 @@ dependencies = [ + + [[package]] + name = "nom" +-version = "6.1.2" ++version = "7.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" ++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" + dependencies = [ +- "bitvec", +- "funty", +- "lexical-core", + "memchr", +- "version_check", ++ "minimal-lexical", + ] + + [[package]] +@@ -773,33 +854,21 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.3.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +-dependencies = [ +- "autocfg 1.0.1", +- "num-integer", +- "num-traits", +-] +- +-[[package]] +-name = "num-bigint" +-version = "0.4.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535" ++checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] + + [[package]] + name = "num-bigint-dig" +-version = "0.7.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" ++checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" + dependencies = [ +- "autocfg 0.1.7", + "byteorder", + "lazy_static", + "libm", +@@ -817,7 +886,7 @@ version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-traits", + ] + +@@ -827,7 +896,7 @@ version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "num-integer", + "num-traits", + ] +@@ -838,7 +907,7 @@ version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" + dependencies = [ +- "autocfg 1.0.1", ++ "autocfg", + "libm", + ] + +@@ -854,15 +923,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.8.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +- +-[[package]] +-name = "opaque-debug" +-version = "0.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "parking_lot" +@@ -884,20 +947,24 @@ dependencies = [ + "cfg-if", + "instant", + "libc", +- "redox_syscall", ++ "redox_syscall 0.2.9", + "smallvec", + "winapi", + ] + + [[package]] +-name = "pem" +-version = "0.8.3" ++name = "paste" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" ++checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" ++ ++[[package]] ++name = "pem-rfc7468" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" + dependencies = [ +- "base64", +- "once_cell", +- "regex", ++ "base64ct", + ] + + [[package]] +@@ -906,11 +973,31 @@ version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + ++[[package]] ++name = "pin-project" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.65", ++] ++ + [[package]] + name = "pin-project-lite" +-version = "0.2.6" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" ++checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + + [[package]] + name = "pin-utils" +@@ -918,6 +1005,28 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "pkcs1" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" ++dependencies = [ ++ "der", ++ "pkcs8", ++ "zeroize", ++] ++ ++[[package]] ++name = "pkcs8" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" ++dependencies = [ ++ "der", ++ "spki", ++ "zeroize", ++] ++ + [[package]] + name = "pkg-config" + version = "0.3.19" +@@ -930,6 +1039,15 @@ version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml 0.5.11", ++] ++ + [[package]] + name = "proc-macro-error" + version = "1.0.4" +@@ -939,7 +1057,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "version_check", + ] + +@@ -955,41 +1073,43 @@ dependencies = [ + ] + + [[package]] +-name = "proc-macro-hack" +-version = "0.5.19" ++name = "proc-macro2" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] +-name = "proc-macro-nested" +-version = "0.1.7" ++name = "ptr_meta" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" ++dependencies = [ ++ "ptr_meta_derive", ++] + + [[package]] +-name = "proc-macro2" +-version = "1.0.27" ++name = "ptr_meta_derive" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" + dependencies = [ +- "unicode-xid", ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" + dependencies = [ + "proc-macro2", + ] + +-[[package]] +-name = "radium" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +- + [[package]] + name = "rand" + version = "0.8.4" +@@ -1039,6 +1159,15 @@ dependencies = [ + "bitflags", + ] + ++[[package]] ++name = "redox_syscall" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" ++dependencies = [ ++ "bitflags", ++] ++ + [[package]] + name = "redox_users" + version = "0.4.0" +@@ -1046,26 +1175,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" + dependencies = [ + "getrandom", +- "redox_syscall", ++ "redox_syscall 0.2.9", + ] + + [[package]] +-name = "regex" +-version = "1.5.4" ++name = "rend" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" + dependencies = [ +- "aho-corasick", +- "memchr", +- "regex-syntax", ++ "bytecheck", + ] + +-[[package]] +-name = "regex-syntax" +-version = "0.6.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +- + [[package]] + name = "ring" + version = "0.16.20" +@@ -1075,41 +1196,73 @@ dependencies = [ + "cc", + "libc", + "once_cell", +- "spin", ++ "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", + ] + ++[[package]] ++name = "rkyv" ++version = "0.7.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3" ++dependencies = [ ++ "bytecheck", ++ "hashbrown 0.12.3", ++ "ptr_meta", ++ "rend", ++ "rkyv_derive", ++ "seahash", ++] ++ ++[[package]] ++name = "rkyv_derive" ++version = "0.7.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 1.0.109", ++] ++ + [[package]] + name = "rsa" +-version = "0.4.1" ++version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" ++checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" + dependencies = [ + "byteorder", + "digest", +- "lazy_static", + "num-bigint-dig", + "num-integer", + "num-iter", + "num-traits", +- "pem", +- "rand", +- "simple_asn1", ++ "pkcs1", ++ "pkcs8", ++ "rand_core", ++ "smallvec", + "subtle", + "zeroize", + ] + + [[package]] + name = "rust_decimal" +-version = "1.15.0" ++version = "1.30.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5446d1cf2dfe2d6367c8b27f2082bdf011e60e76fa1fcd140047f535156d6e7" ++checksum = "d0446843641c69436765a35a5a77088e28c2e6a12da93e84aa3ab1cd4aa5a042" + dependencies = [ + "arrayvec", ++ "borsh", ++ "bytecheck", ++ "byteorder", ++ "bytes", + "num-traits", ++ "rand", ++ "rkyv", + "serde", ++ "serde_json", + ] + + [[package]] +@@ -1147,33 +1300,38 @@ dependencies = [ + "untrusted", + ] + ++[[package]] ++name = "seahash" ++version = "4.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" ++ + [[package]] + name = "serde" +-version = "1.0.126" ++version = "1.0.202" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.126" ++version = "1.0.202" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.117" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" + dependencies = [ +- "indexmap", + "itoa", + "ryu", + "serde", +@@ -1181,28 +1339,24 @@ dependencies = [ + + [[package]] + name = "sha-1" +-version = "0.9.6" ++version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" ++checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" + dependencies = [ +- "block-buffer", + "cfg-if", + "cpufeatures", + "digest", +- "opaque-debug", + ] + + [[package]] + name = "sha2" +-version = "0.9.5" ++version = "0.10.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" ++checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" + dependencies = [ +- "block-buffer", + "cfg-if", + "cpufeatures", + "digest", +- "opaque-debug", + ] + + [[package]] +@@ -1247,16 +1401,10 @@ dependencies = [ + ] + + [[package]] +-name = "simple_asn1" +-version = "0.5.4" ++name = "simdutf8" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" +-dependencies = [ +- "chrono", +- "num-bigint 0.4.2", +- "num-traits", +- "thiserror", +-] ++checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + + [[package]] + name = "slab" +@@ -1266,9 +1414,9 @@ checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + + [[package]] + name = "smallvec" +-version = "1.6.1" ++version = "1.13.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + + [[package]] + name = "spin" +@@ -1276,24 +1424,41 @@ version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + ++[[package]] ++name = "spin" ++version = "0.9.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" ++dependencies = [ ++ "lock_api", ++] ++ ++[[package]] ++name = "spki" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" ++dependencies = [ ++ "base64ct", ++ "der", ++] ++ + [[package]] + name = "sqlformat" +-version = "0.1.6" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c" ++checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" + dependencies = [ +- "lazy_static", +- "maplit", ++ "itertools", + "nom", +- "regex", + "unicode_categories", + ] + + [[package]] + name = "sqlx" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e4b94ab0f8c21ee4899b93b06451ef5d965f1a355982ee73684338228498440" ++checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" + dependencies = [ + "sqlx-core", + "sqlx-macros", +@@ -1301,9 +1466,9 @@ dependencies = [ + + [[package]] + name = "sqlx-core" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026" ++checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" + dependencies = [ + "ahash", + "atoi", +@@ -1312,29 +1477,32 @@ dependencies = [ + "byteorder", + "bytes", + "chrono", +- "crossbeam-channel", + "crossbeam-queue", +- "crossbeam-utils", + "digest", + "dirs", + "either", ++ "event-listener", ++ "flume", + "futures-channel", + "futures-core", ++ "futures-executor", + "futures-intrusive", + "futures-util", + "generic-array", + "hashlink", + "hex", ++ "hkdf", + "hmac", ++ "indexmap", + "itoa", + "libc", + "libsqlite3-sys", + "log", + "md-5", + "memchr", +- "num-bigint 0.3.2", ++ "num-bigint", + "once_cell", +- "parking_lot", ++ "paste", + "percent-encoding", + "rand", + "rsa", +@@ -1358,41 +1526,34 @@ dependencies = [ + + [[package]] + name = "sqlx-macros" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dc33c35d54774eed73d54568d47a6ac099aed8af5e1556a017c131be88217d5" ++checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" + dependencies = [ + "dotenv", + "either", +- "futures", +- "heck", ++ "heck 0.4.1", + "once_cell", + "proc-macro2", + "quote", + "serde_json", + "sqlx-core", + "sqlx-rt", +- "syn", ++ "syn 1.0.109", + "url", + ] + + [[package]] + name = "sqlx-rt" +-version = "0.5.7" ++version = "0.5.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14302b678d9c76b28f2e60115211e25e0aabc938269991745a169753dc00e35c" ++checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" + dependencies = [ + "once_cell", + "tokio", + "tokio-rustls", + ] + +-[[package]] +-name = "static_assertions" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +- + [[package]] + name = "stringprep" + version = "0.1.2" +@@ -1426,11 +1587,11 @@ version = "0.4.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" + dependencies = [ +- "heck", ++ "heck 0.3.3", + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1445,10 +1606,10 @@ version = "0.21.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" + dependencies = [ +- "heck", ++ "heck 0.3.3", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1459,33 +1620,26 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" + + [[package]] + name = "syn" +-version = "1.0.73" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +-name = "synstructure" +-version = "0.12.4" ++name = "syn" ++version = "2.0.65" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" + dependencies = [ + "proc-macro2", + "quote", +- "syn", +- "unicode-xid", ++ "unicode-ident", + ] + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "textwrap" + version = "0.11.0" +@@ -1497,22 +1651,22 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.25" ++version = "1.0.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" ++checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.25" ++version = "1.0.61" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" ++checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.65", + ] + + [[package]] +@@ -1542,11 +1696,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + + [[package]] + name = "tokio" +-version = "1.11.0" ++version = "1.16.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" ++checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" + dependencies = [ +- "autocfg 1.0.1", + "bytes", + "libc", + "memchr", +@@ -1562,13 +1715,13 @@ dependencies = [ + + [[package]] + name = "tokio-macros" +-version = "1.3.0" ++version = "1.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" ++checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1584,9 +1737,9 @@ dependencies = [ + + [[package]] + name = "tokio-stream" +-version = "0.1.7" ++version = "0.1.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" ++checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" + dependencies = [ + "futures-core", + "pin-project-lite", +@@ -1602,6 +1755,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "toml" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" ++dependencies = [ ++ "serde", ++] ++ + [[package]] + name = "tui" + version = "0.15.0" +@@ -1617,9 +1779,9 @@ dependencies = [ + + [[package]] + name = "typenum" +-version = "1.13.0" ++version = "1.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + + [[package]] + name = "unicode-bidi" +@@ -1630,6 +1792,12 @@ dependencies = [ + "matches", + ] + ++[[package]] ++name = "unicode-ident" ++version = "1.0.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++ + [[package]] + name = "unicode-normalization" + version = "0.1.19" +@@ -1651,12 +1819,6 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +-[[package]] +-name = "unicode-xid" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +- + [[package]] + name = "unicode_categories" + version = "0.1.1" +@@ -1705,6 +1867,12 @@ version = "0.10.2+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + ++[[package]] ++name = "wasite" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" ++ + [[package]] + name = "wasm-bindgen" + version = "0.2.74" +@@ -1726,7 +1894,7 @@ dependencies = [ + "log", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-shared", + ] + +@@ -1748,7 +1916,7 @@ checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +@@ -1801,11 +1969,12 @@ dependencies = [ + + [[package]] + name = "whoami" +-version = "1.1.2" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" ++checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" + dependencies = [ +- "wasm-bindgen", ++ "redox_syscall 0.4.1", ++ "wasite", + "web-sys", + ] + +@@ -1831,29 +2000,8 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- + [[package]] + name = "zeroize" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +-dependencies = [ +- "zeroize_derive", +-] +- +-[[package]] +-name = "zeroize_derive" +-version = "1.1.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +-dependencies = [ +- "proc-macro2", +- "quote", +- "syn", +- "synstructure", +-] ++checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +diff --git a/Cargo.toml b/Cargo.toml +index 95f5b91..ea7eec5 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,7 +20,7 @@ tui = { version = "0.15.0", features = ["crossterm"], default-features = false } + crossterm = "0.20" + anyhow = "1.0.38" + unicode-width = "0.1" +-sqlx = { version = "0.5.6", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } ++sqlx = { version = "0.5.13", features = ["mysql", "postgres", "sqlite", "chrono", "runtime-tokio-rustls", "decimal", "json"], default-features = false } + chrono = "0.4" + tokio = { version = "1.11.0", features = ["full"] } + futures = "0.3.5" diff --git a/pkgs/development/tools/database/gobang/default.nix b/pkgs/development/tools/database/gobang/default.nix deleted file mode 100644 index b3611169996c..000000000000 --- a/pkgs/development/tools/database/gobang/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, CoreFoundation -, Security -, SystemConfiguration -}: - -rustPlatform.buildRustPackage rec { - pname = "gobang"; - version = "0.1.0-alpha.5"; - - src = fetchFromGitHub { - owner = "tako8ki"; - repo = pname; - rev = "v${version}"; - sha256 = "02glb3hlprpdc72ji0248a7g0vr36yxr0gfbbms2m25v251dyaa6"; - }; - - cargoSha256 = "sha256-Tiefet5gLpiuYY6Scg5fjnaPiZfVl5Gy2oZFdhgNRxY="; - - buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - Security - SystemConfiguration - ]; - - meta = with lib; { - description = "A cross-platform TUI database management tool written in Rust"; - homepage = "https://github.com/tako8ki/gobang"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2907d324cc..4d00e751819e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16024,10 +16024,6 @@ with pkgs; gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; - gobang = callPackage ../development/tools/database/gobang { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - }; - goblob = callPackage ../tools/security/goblob { }; gogetdoc = callPackage ../development/tools/gogetdoc { }; From 234f4db797d0a64bd2995601f15fd12c2394157f Mon Sep 17 00:00:00 2001 From: Matt Kline Date: Thu, 23 May 2024 14:22:33 -0700 Subject: [PATCH 307/311] nixos/snapper, nixos/borgbackup: Fix module doc typo The persistentTimer argument sets the _Persistent_ field in systemd.timer(5). Pointed out in #312549 --- nixos/modules/services/backup/borgbackup.nix | 2 +- nixos/modules/services/misc/snapper.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 04f971008073..a3c0715c9e60 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -361,7 +361,7 @@ in { type = types.bool; example = true; description = '' - Set the `persistentTimer` option for the + Set the `Persistent` option for the {manpage}`systemd.timer(5)` which triggers the backup immediately if the last trigger was missed (e.g. if the system was powered down). diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 33207ac2b5bd..a42fca5b6028 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -108,7 +108,7 @@ in type = types.bool; example = true; description = '' - Set the `persistentTimer` option for the + Set the `Persistent` option for the {manpage}`systemd.timer(5)` which triggers the snapshot immediately if the last trigger was missed (e.g. if the system was powered down). From 0f3add331c6a4709bbe5f6f39ba99e3207775d6d Mon Sep 17 00:00:00 2001 From: almini Date: Mon, 18 Mar 2024 17:27:11 +0100 Subject: [PATCH 308/311] segger-jlink: 794l -> 796b --- pkgs/by-name/se/segger-jlink/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/se/segger-jlink/package.nix b/pkgs/by-name/se/segger-jlink/package.nix index 074f687f35f0..d7b2e0cfcaeb 100755 --- a/pkgs/by-name/se/segger-jlink/package.nix +++ b/pkgs/by-name/se/segger-jlink/package.nix @@ -15,25 +15,25 @@ let supported = { x86_64-linux = { name = "x86_64"; - hash = "sha256-CELUteYzy0oMxDonOot+DR5MgGjSRwLgRCbJRAaS/EY="; + hash = "sha256-UsDP+wMS7ZeWMQBObwv5RxbwuWU8nLnHes7LEXK6imE="; }; i686-linux = { name = "i386"; - hash = "sha256-lw3gqgCjmASkelj5lPDnltRJ1Cb+318QjrbirQ6oRFI="; + hash = "sha256-InNHXWAc6QZEWyEcTTUCRMDsKd0RtR8d7O0clWKuFo8="; }; aarch64-linux = { name = "arm64"; - hash = "sha256-yq/L9k+22OWhwnAROJlsyYd/AH5SHJD231y6xd83N6g="; + hash = "sha256-ueIGdqfuIRCuEwaPkgZMgghO9DU11IboLLMryg/mxQ8="; }; armv7l-linux = { name = "arm"; - hash = "sha256-FAnzZzz3tgSxgX5n3CUrCbD5lfub91cDkjdD/lVaf0g="; + hash = "sha256-6nTQGQpkbqQntheQqiUAdVS4rp30nl2KRUn5Adsfeoo="; }; }; platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); - version = "794l"; + version = "796b"; url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz"; From 44744fc83f3ce1034eaf0b6cbb245a88234a42fe Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 23 May 2024 22:51:08 +0100 Subject: [PATCH 309/311] githooks.tests: fix eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. githooks.tests error: … while evaluating the 'name' attribute of a derivation … while evaluating a branch condition at lib/strings.nix:1194:3: 1193| # First detect the common case of already valid strings, to speed those up 1194| if stringLength string <= 207 && okRegex string != null | ^ 1195| then unsafeDiscardStringContext string … in the left operand of the AND (&&) operator at lib/strings.nix:1194:33: 1193| # First detect the common case of already valid strings, to speed those up 1194| if stringLength string <= 207 && okRegex string != null | ^ 1195| then unsafeDiscardStringContext string (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: expected a set but found a string: "githooks-cli" --- pkgs/by-name/gi/githooks/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix index f4e4cd02bd86..8a68c861471b 100644 --- a/pkgs/by-name/gi/githooks/package.nix +++ b/pkgs/by-name/gi/githooks/package.nix @@ -5,6 +5,7 @@ git, testers, makeWrapper, + githooks }: buildGoModule rec { pname = "githooks"; @@ -70,7 +71,7 @@ buildGoModule rec { ''; passthru.tests.version = testers.testVersion { - package = "githooks-cli"; + package = githooks; command = "githooks-cli --version"; inherit version; }; From 5771dbfa7d2f33c4d2bb417ec365282707e9156c Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 23 May 2024 17:03:01 -0500 Subject: [PATCH 310/311] bicep: fix updater script --- pkgs/by-name/bi/bicep/updater.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bicep/updater.sh b/pkgs/by-name/bi/bicep/updater.sh index dc45cc135746..22ab3eced420 100755 --- a/pkgs/by-name/bi/bicep/updater.sh +++ b/pkgs/by-name/bi/bicep/updater.sh @@ -4,14 +4,15 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" +deps_file="$(realpath "./deps.nix")" new_version="$(curl -s "https://api.github.com/repos/azure/bicep/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date!" - exit 0 + echo "Already up to date!" + exit 0 fi cd ../../../.. -update-source-version bicep "${new_version//v}" -nix-build -A bicep.fetch-deps --no-out-link +update-source-version bicep "${new_version//v/}" +"$(nix-build . -A bicep.fetch-deps --no-out-link)" "$deps_file" From a46ce7c77d9d9ee6af56196915106f6fb7b66c2b Mon Sep 17 00:00:00 2001 From: purepani Date: Sun, 12 May 2024 22:57:48 -0500 Subject: [PATCH 311/311] svelte-language-server: convert to buildNpmPackage --- .../svelte-language-server/package-lock.json | 1943 +++++++++++++++++ .../sv/svelte-language-server/package.nix | 34 + .../sv/svelte-language-server/update.sh | 30 + pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 258 --- 7 files changed, 2008 insertions(+), 260 deletions(-) create mode 100644 pkgs/by-name/sv/svelte-language-server/package-lock.json create mode 100644 pkgs/by-name/sv/svelte-language-server/package.nix create mode 100755 pkgs/by-name/sv/svelte-language-server/update.sh diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json new file mode 100644 index 000000000000..e4dd56ef9220 --- /dev/null +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -0,0 +1,1943 @@ +{ + "name": "svelte-language-server", + "version": "0.16.9", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "svelte-language-server", + "version": "0.16.9", + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "@vscode/emmet-helper": "2.8.4", + "chokidar": "^3.4.1", + "estree-walker": "^2.0.1", + "fast-glob": "^3.2.7", + "lodash": "^4.17.21", + "prettier": "~3.2.5", + "prettier-plugin-svelte": "^3.2.2", + "svelte": "^3.57.0", + "svelte-preprocess": "^5.1.3", + "svelte2tsx": "~0.7.0", + "typescript": "^5.3.2", + "typescript-auto-import-cache": "^0.3.2", + "vscode-css-languageservice": "~6.2.10", + "vscode-html-languageservice": "~5.1.1", + "vscode-languageserver": "8.0.2", + "vscode-languageserver-protocol": "3.17.2", + "vscode-languageserver-types": "3.17.2", + "vscode-uri": "~3.0.0" + }, + "bin": { + "svelteserver": "bin/server.js" + }, + "devDependencies": { + "@types/estree": "^0.0.42", + "@types/lodash": "^4.14.116", + "@types/mocha": "^9.1.0", + "@types/node": "^16.0.0", + "@types/prettier": "^2.2.3", + "@types/sinon": "^7.5.2", + "cross-env": "^7.0.2", + "mocha": "^9.2.0", + "sinon": "^11.0.0", + "ts-node": "^10.0.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@emmetio/abbreviation": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz", + "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/css-abbreviation": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz", + "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==", + "dependencies": { + "@emmetio/scanner": "^1.0.4" + } + }, + "node_modules/@emmetio/scanner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz", + "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==" + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", + "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@sinonjs/samsam": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.3.tgz", + "integrity": "sha512-nhOb2dWPeb1sd3IQXL/dVPnKHDOAFfvichtBf4xV00/rU1QbPCQqKMbvIheIjqwVjh7qIgf2AHTHi391yMOMpQ==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.6.0", + "lodash.get": "^4.4.2", + "type-detect": "^4.0.8" + } + }, + "node_modules/@sinonjs/text-encoding": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", + "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", + "dev": true + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true + }, + "node_modules/@types/estree": { + "version": "0.0.42", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz", + "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==", + "dev": true + }, + "node_modules/@types/lodash": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", + "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", + "dev": true + }, + "node_modules/@types/mocha": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", + "dev": true + }, + "node_modules/@types/node": { + "version": "16.18.97", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.97.tgz", + "integrity": "sha512-4muilE1Lbfn57unR+/nT9AFjWk0MtWi5muwCEJqnOvfRQDbSfLCUdN7vCIg8TYuaANfhLOV85ve+FNpiUsbSRg==", + "dev": true + }, + "node_modules/@types/prettier": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", + "dev": true + }, + "node_modules/@types/pug": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.10.tgz", + "integrity": "sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==" + }, + "node_modules/@types/sinon": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-7.5.2.tgz", + "integrity": "sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==", + "dev": true + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "node_modules/@vscode/emmet-helper": { + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", + "integrity": "sha512-lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg==", + "dependencies": { + "emmet": "^2.3.0", + "jsonc-parser": "^2.3.0", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "^3.15.1", + "vscode-nls": "^5.0.0", + "vscode-uri": "^2.1.2" + } + }, + "node_modules/@vscode/emmet-helper/node_modules/vscode-uri": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz", + "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" + }, + "node_modules/@vscode/l10n": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" + }, + "node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "engines": { + "node": "*" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/dedent-js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dedent-js/-/dedent-js-1.0.1.tgz", + "integrity": "sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==" + }, + "node_modules/detect-indent": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/emmet": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", + "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "workspaces": [ + "./packages/scanner", + "./packages/abbreviation", + "./packages/css-abbreviation", + "./" + ], + "dependencies": { + "@emmetio/abbreviation": "^2.3.3", + "@emmetio/css-abbreviation": "^2.1.8" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==" + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsonc-parser": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz", + "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" + }, + "node_modules/just-extend": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", + "dev": true + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/magic-string": { + "version": "0.30.10", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", + "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "engines": { + "node": ">=4" + } + }, + "node_modules/minimatch": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", + "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", + "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.3", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "4.2.1", + "ms": "2.1.3", + "nanoid": "3.3.1", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "workerpool": "6.2.0", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/nise": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", + "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^11.2.2", + "@sinonjs/text-encoding": "^0.7.2", + "just-extend": "^6.2.0", + "path-to-regexp": "^6.2.1" + } + }, + "node_modules/nise/node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/nise/node_modules/@sinonjs/fake-timers": { + "version": "11.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz", + "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-to-regexp": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", + "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prettier": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-svelte": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.3.tgz", + "integrity": "sha512-wJq8RunyFlWco6U0WJV5wNCM7zpBFakS76UBSbmzMGpncpK98NZABaE+s7n8/APDCEVNHXC5Mpq+MLebQtsRlg==", + "peerDependencies": { + "prettier": "^3.0.0", + "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/sander": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz", + "integrity": "sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==", + "dependencies": { + "es6-promise": "^3.1.2", + "graceful-fs": "^4.1.3", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.2" + } + }, + "node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/sinon": { + "version": "11.1.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.2.tgz", + "integrity": "sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==", + "deprecated": "16.1.1", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^1.8.3", + "@sinonjs/fake-timers": "^7.1.2", + "@sinonjs/samsam": "^6.0.2", + "diff": "^5.0.0", + "nise": "^5.1.0", + "supports-color": "^7.2.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/sinon" + } + }, + "node_modules/sinon/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/sorcery": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz", + "integrity": "sha512-J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw==", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.14", + "buffer-crc32": "^0.2.5", + "minimist": "^1.2.0", + "sander": "^0.5.0" + }, + "bin": { + "sorcery": "bin/sorcery" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/svelte": { + "version": "3.59.2", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.2.tgz", + "integrity": "sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/svelte-preprocess": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz", + "integrity": "sha512-IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA==", + "hasInstallScript": true, + "dependencies": { + "@types/pug": "^2.0.6", + "detect-indent": "^6.1.0", + "magic-string": "^0.30.5", + "sorcery": "^0.11.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">= 16.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.10.2", + "coffeescript": "^2.5.1", + "less": "^3.11.3 || ^4.0.0", + "postcss": "^7 || ^8", + "postcss-load-config": "^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", + "pug": "^3.0.0", + "sass": "^1.26.8", + "stylus": "^0.55.0", + "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0", + "svelte": "^3.23.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0", + "typescript": ">=3.9.5 || ^4.0.0 || ^5.0.0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "coffeescript": { + "optional": true + }, + "less": { + "optional": true + }, + "postcss": { + "optional": true + }, + "postcss-load-config": { + "optional": true + }, + "pug": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/svelte2tsx": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.8.tgz", + "integrity": "sha512-ABK3RDFcy59AqAiU1N5Kxu1RnKrb1GDMrQjLgNgJfE8Q+coCKpjCAPtUVKQM2HnmuqeNWcT3NqfXbE+ZmN5Pow==", + "dependencies": { + "dedent-js": "^1.0.1", + "pascal-case": "^3.1.1" + }, + "peerDependencies": { + "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0", + "typescript": "^4.9.4 || ^5.0.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typescript-auto-import-cache": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", + "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "dependencies": { + "semver": "^7.3.8" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true + }, + "node_modules/vscode-css-languageservice": { + "version": "6.2.14", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz", + "integrity": "sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-css-languageservice/node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" + }, + "node_modules/vscode-html-languageservice": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.2.tgz", + "integrity": "sha512-wkWfEx/IIR3s2P5yD4aTGHiOb8IAzFxgkSt1uSC3itJ4oDAm23yG7o0L29JljUdnXDDgLafPAvhv8A2I/8riHw==", + "dependencies": { + "@vscode/l10n": "^0.0.18", + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.0.8" + } + }, + "node_modules/vscode-html-languageservice/node_modules/vscode-languageserver-types": { + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", + "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" + }, + "node_modules/vscode-jsonrpc": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz", + "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/vscode-languageserver": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz", + "integrity": "sha512-bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==", + "dependencies": { + "vscode-languageserver-protocol": "3.17.2" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", + "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", + "dependencies": { + "vscode-jsonrpc": "8.0.2", + "vscode-languageserver-types": "3.17.2" + } + }, + "node_modules/vscode-languageserver-textdocument": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz", + "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==" + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" + }, + "node_modules/vscode-nls": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", + "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" + }, + "node_modules/vscode-uri": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz", + "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==" + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/workerpool": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", + "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix new file mode 100644 index 000000000000..cbb8dd2234fd --- /dev/null +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildNpmPackage +, fetchurl +}: +let + version = "0.16.9"; +in buildNpmPackage { + pname = "svelte-language-server"; + inherit version; + + src = fetchurl { + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; + hash = "sha256-RR2RzBZGCyd0hnEX4iD5pjmgtq8GzgrGZAG8Qq63EZA="; + }; + + npmDepsHash = "sha256-WYiWm/2gr/0kXZOYeMjVYZOg0JttghPF9jkwNnb0nQo="; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Language server (implementing the language server protocol) for Svelte"; + downloadPage = "https://www.npmjs.com/package/svelte-language-server"; + homepage = "https://github.com/sveltejs/language-tools"; + license = lib.licenses.mit; + mainProgram = "svelteserver"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/by-name/sv/svelte-language-server/update.sh b/pkgs/by-name/sv/svelte-language-server/update.sh new file mode 100755 index 000000000000..40d1ef0175dc --- /dev/null +++ b/pkgs/by-name/sv/svelte-language-server/update.sh @@ -0,0 +1,30 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget + +set -euo pipefail +pushd "$(dirname "${BASH_SOURCE[0]}")" + +version=$(npm view svelte-language-server version) +tarball="svelte-language-server-$version.tgz" +url="https://registry.npmjs.org/svelte-language-server/-/$tarball" + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix + +sha256=$(nix-prefetch-url "$url") +src_hash=$(nix-hash --type sha256 --to-sri "$sha256") +sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix + +rm -f package-lock.json package.json *.tgz +wget "$url" +tar xf "$tarball" --strip-components=1 package/package.json +npm i --package-lock-only +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix +rm -f package.json *.tgz + +popd diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 64708d8ffd92..16b3f81b9cf1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -133,6 +133,7 @@ mapAliases { stf = throw "stf was removed because it was broken"; # added 2023-08-21 inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 + inherit (pkgs) svelte-language-server; # Added 2024-05-12 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09 inherit (pkgs) terser; # Added 2023-08-31 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 90093aaafde1..d2b2da19a2dd 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -52,7 +52,6 @@ purty = "purty"; pscid = "pscid"; remod-cli = "remod"; - svelte-language-server = "svelteserver"; teck-programmer = "teck-firmware-upgrade"; typescript-language-server = "typescript-language-server"; uglify-js = "uglifyjs"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c0d021e9f472..8a6a0184a72e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -216,7 +216,6 @@ , "sql-formatter" , "stackdriver-statsd-backend" , "svelte-check" -, "svelte-language-server" , "svgo" , "tailwindcss" , "teck-programmer" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 9b498be3b7fa..bafa74f05a56 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -92612,264 +92612,6 @@ in bypassCache = true; reconstructLock = true; }; - svelte-language-server = nodeEnv.buildNodePackage { - name = "svelte-language-server"; - packageName = "svelte-language-server"; - version = "0.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.16.5.tgz"; - sha512 = "gzGlDikWDQZn+ccX0hyCamzGuTEXMwGNiXOXiNBtK+HJg+aL7wKcHnjwHg72K4K5s85OIYZE0zUj6JXjkAJkKQ=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.3.0" - sources."@babel/code-frame-7.23.5" - sources."@babel/compat-data-7.23.5" - sources."@babel/core-7.24.0" - sources."@babel/generator-7.23.6" - sources."@babel/helper-compilation-targets-7.23.6" - sources."@babel/helper-environment-visitor-7.22.20" - sources."@babel/helper-function-name-7.23.0" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.3" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.23.4" - sources."@babel/helper-validator-identifier-7.22.20" - sources."@babel/helper-validator-option-7.23.5" - sources."@babel/helpers-7.24.0" - sources."@babel/highlight-7.23.4" - sources."@babel/parser-7.24.0" - sources."@babel/template-7.24.0" - sources."@babel/traverse-7.24.0" - sources."@babel/types-7.24.0" - sources."@emmetio/abbreviation-2.3.3" - sources."@emmetio/css-abbreviation-2.1.8" - sources."@emmetio/scanner-1.0.4" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@types/pug-2.0.10" - (sources."@vscode/emmet-helper-2.8.4" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) - sources."@vscode/l10n-0.0.18" - sources."acorn-7.4.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.3" - sources."asap-2.0.6" - sources."assert-never-1.2.1" - sources."atob-2.1.2" - sources."babel-walk-3.0.0-canary-5" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browserslist-4.23.0" - sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.7" - sources."caniuse-lite-1.0.30001599" - sources."chalk-2.4.2" - sources."character-parser-2.2.0" - sources."chokidar-3.6.0" - sources."coffeescript-2.7.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."concat-map-0.0.1" - sources."constantinople-4.0.1" - sources."convert-source-map-2.0.0" - sources."copy-anything-2.0.6" - sources."css-3.0.0" - sources."debug-4.3.4" - sources."decode-uri-component-0.2.2" - sources."dedent-js-1.0.1" - sources."define-data-property-1.1.4" - sources."detect-indent-6.1.0" - sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.710" - sources."emmet-2.4.7" - sources."errno-0.1.8" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."es6-promise-3.3.1" - sources."escalade-3.1.2" - sources."escape-string-regexp-1.0.5" - sources."estree-walker-2.0.2" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.0.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.4" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globals-11.12.0" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.2" - sources."hasown-2.0.2" - sources."iconv-lite-0.6.3" - sources."image-size-0.5.5" - sources."immutable-4.3.5" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-core-module-2.13.1" - sources."is-expression-4.0.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-promise-2.2.2" - sources."is-regex-1.1.4" - sources."is-what-3.14.1" - sources."jiti-1.21.0" - sources."js-stringify-1.0.2" - sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json5-2.2.3" - sources."jsonc-parser-2.3.1" - sources."jstransformer-1.0.0" - sources."less-4.2.0" - sources."lilconfig-3.1.1" - sources."lodash-4.17.21" - sources."lower-case-2.0.2" - sources."lru-cache-5.1.1" - sources."magic-string-0.30.8" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."min-indent-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."nanoid-3.3.7" - sources."needle-3.3.1" - sources."no-case-3.0.4" - sources."node-releases-2.0.14" - sources."normalize-path-3.0.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."parse-node-version-1.0.1" - sources."pascal-case-3.1.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."postcss-8.4.36" - sources."postcss-load-config-5.0.3" - sources."prettier-3.2.5" - sources."prettier-plugin-svelte-3.2.2" - sources."promise-7.3.1" - sources."prr-1.0.1" - sources."pug-3.0.2" - sources."pug-attrs-3.0.0" - sources."pug-code-gen-3.0.2" - sources."pug-error-2.0.0" - sources."pug-filters-4.0.0" - sources."pug-lexer-5.0.1" - sources."pug-linker-4.0.0" - sources."pug-load-3.0.0" - sources."pug-parser-6.0.0" - sources."pug-runtime-3.0.1" - sources."pug-strip-comments-2.0.0" - sources."pug-walk-2.0.0" - sources."queue-microtask-1.2.3" - sources."readdirp-3.6.0" - sources."resolve-1.22.8" - sources."reusify-1.0.4" - sources."rimraf-2.7.1" - sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" - sources."sander-0.5.1" - sources."sass-1.72.0" - sources."sax-1.3.0" - sources."semver-6.3.1" - sources."set-function-length-1.2.2" - sources."sorcery-0.11.0" - sources."source-map-0.6.1" - sources."source-map-js-1.1.0" - sources."source-map-resolve-0.6.0" - sources."strip-indent-3.0.0" - (sources."stylus-0.55.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."sax-1.2.4" - sources."source-map-0.7.4" - ]; - }) - sources."sugarss-4.0.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svelte-3.59.2" - sources."svelte-preprocess-5.1.3" - sources."svelte2tsx-0.7.4" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."token-stream-1.0.0" - sources."tslib-2.6.2" - sources."typescript-5.4.2" - (sources."typescript-auto-import-cache-0.3.2" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.6.0" - sources."yallist-4.0.0" - ]; - }) - sources."update-browserslist-db-1.0.13" - sources."void-elements-3.1.0" - (sources."vscode-css-languageservice-6.2.12" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" - ]; - }) - (sources."vscode-html-languageservice-5.1.2" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" - ]; - }) - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.8" - sources."with-7.0.2" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - sources."yaml-2.4.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A language server for Svelte"; - homepage = "https://github.com/sveltejs/language-tools#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo";